diff --git a/.gitignore b/.gitignore
index c34106093..b3120606e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ googlePlayAndroidDeveloper.json
 google-services.json
 firebase-crashreporting.json
 services.tar
+.idea/assetWizardSettings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e471265c6..85c2d05bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,15 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="100" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -36,31 +27,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
@@ -71,7 +37,6 @@
       <option name="TERNARY_OPERATION_WRAP" value="1" />
     </codeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839b..000000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 1c24f9a8d..3097f3190 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinCommonCompilerArguments">
-    <option name="languageVersion" value="1.1" />
-    <option name="apiVersion" value="1.1" />
+    <option name="apiVersion" value="1.3" />
+    <option name="languageVersion" value="1.3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f5a125d9b..2515c7b74 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/MyTargets.iml" filepath="$PROJECT_DIR$/MyTargets.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/buildSrc/buildSrc.iml" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" />
       <module fileurl="file://$PROJECT_DIR$/shared/shared.iml" filepath="$PROJECT_DIR$/shared/shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/tools.iml" filepath="$PROJECT_DIR$/tools/tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/wearable/wearable.iml" filepath="$PROJECT_DIR$/wearable/wearable.iml" />
diff --git a/.travis.yml b/.travis.yml
index 7563c6d96..2ea561e28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +1,62 @@
 language: android
+dist: trusty
 jdk:
-- oraclejdk8
+  - openjdk8
 env:
   global:
-  # - ADB_INSTALL_TIMEOUT=8
-  - ANDROID_API_LEVEL=27
-  - ANDROID_BUILD_TOOLS_VERSION=27.0.2
-  # - ANDROID_ABI=armeabi-v7a
-  # - EMULATOR_API_LEVEL=21
-  - PWD=`pwd`
+    # - ADB_INSTALL_TIMEOUT=8
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    # - ANDROID_ABI=armeabi-v7a
+    # - EMULATOR_API_LEVEL=21
+    - PWD=`pwd`
 android:
   components:
-  - tools
-  - platform-tools
-  - tools
-  - build-tools-$ANDROID_BUILD_TOOLS_VERSION
-  - android-$ANDROID_API_LEVEL
-  # - android-$EMULATOR_API_LEVEL
-  - extra-google-google_play_services
-  - extra-google-m2repository
-  - extra-android-m2repository
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+    - android-$ANDROID_API_LEVEL
+    # - android-$EMULATOR_API_LEVEL
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
   # - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
+#  licenses:
+#    - 'android-sdk-preview-license-52d11cd2'
+#    - 'android-sdk-license-.+'
+#    - 'google-gdk-license-.+'
 before_install:
-- openssl aes-256-cbc -K $encrypted_143bf53fc355_key -iv $encrypted_143bf53fc355_iv -in services.tar.enc -out services.tar -d
-- tar xvf services.tar
-- wget https://raw.githubusercontent.com/JakeWharton/pidcat/master/pidcat.py
-- touch ~/.android/repositories.cfg
-- yes | sdkmanager "platforms;android-27"
-- mkdir -p "$ANDROID_HOME/licenses"
-- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-- echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
-- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - openssl aes-256-cbc -K $encrypted_143bf53fc355_key -iv $encrypted_143bf53fc355_iv -in services.tar.enc -out services.tar -d
+  - tar xvf services.tar
+  - wget https://raw.githubusercontent.com/JakeWharton/pidcat/master/pidcat.py
+  - touch ~/.android/repositories.cfg
+  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "build-tools;28.0.3"
+  - mkdir -p "$ANDROID_HOME/licenses"
+  - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee%" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - yes | sdkmanager --update
+  - yes | sdkmanager --licenses
 install:
-# Converts the shallow clone to a full clone
-# This is necessary in order to determine the current app version code
-- git fetch --unshallow --tags
+  # Converts the shallow clone to a full clone
+  # This is necessary in order to determine the current app version code
+  - git fetch --unshallow --tags
 before_script:
-# - echo no | android create avd -f -n test -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI -s WVGA800 -c 128M
-# - emulator -avd test -no-audio -no-window &
-- ./gradlew clean
+  # - echo no | android create avd -f -n test -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI -s WVGA800 -c 128M
+  # - emulator -avd test -no-audio -no-window &
+  - ./gradlew clean
 script:
-- echo -e '\033[0;33mBuilding...\033[0m' && echo -en 'travis_fold:start:script.build\\r'
-- ./gradlew assembleRegularRelease -PdisablePreDex
-- echo -en 'travis_fold:end:script.build\\r'
+  - echo -e '\033[0;33mBuilding...\033[0m' && echo -en 'travis_fold:start:script.build\\r'
+  - ./gradlew assembleRegularRelease -PdisablePreDex
+  - echo -en 'travis_fold:end:script.build\\r'
 
-- echo -e '\033[0;33mUnit tests...\033[0m' && echo -en 'travis_fold:start:script.unittest\\r'
-- ./gradlew testRelease -PdisablePreDex
-- echo -en 'travis_fold:end:script.unittest\\r'
+  - echo -e '\033[0;33mUnit tests...\033[0m' && echo -en 'travis_fold:start:script.unittest\\r'
+  - ./gradlew testRelease -PdisablePreDex
+  - echo -en 'travis_fold:end:script.unittest\\r'
 
 # - echo -e '\033[0;33mUI tests...\033[0m' && echo -en 'travis_fold:start:script.uitest\\r'
 # - ./gradlew :app:assembleDevDebug :app:assembleDevDebugAndroidTest -PdisablePreDex
@@ -60,13 +70,13 @@ script:
 # - echo -en 'travis_fold:end:script.uitest\\r'
 
 after_success:
-- |
-  if [[ "$TRAVIS_TAG" ]]; then
-    ./gradlew bootstrapRegularReleasePlayResources publishRegularRelease
-    ./gradlew -PFirebaseServiceAccountFilePath=$PWD/firebase-crashreporting.json :app:firebaseUploadRegularReleaseProguardMapping
-    ./dropbox_uploader.sh upload app/build/outputs/apk/regular/release/app-regular-release.apk /Release/$TRAVIS_TAG/MyTargets.apk
-    ./dropbox_uploader.sh upload app/build/outputs/mapping/regular/release/mapping.txt /Release/$TRAVIS_TAG/mapping.txt
-  fi
+  - |
+    if [[ "$TRAVIS_TAG" ]]; then
+      ./gradlew bootstrapRegularReleasePlayResources publishRegularRelease
+      ./gradlew -PFirebaseServiceAccountFilePath=$PWD/firebase-crashreporting.json :app:firebaseUploadRegularReleaseProguardMapping
+      ./dropbox_uploader.sh upload app/build/outputs/apk/regular/release/app-regular-release.apk /Release/$TRAVIS_TAG/MyTargets.apk
+      ./dropbox_uploader.sh upload app/build/outputs/mapping/regular/release/mapping.txt /Release/$TRAVIS_TAG/mapping.txt
+    fi
 # - bash <(curl -s https://codecov.io/bash)
 # - ./gradlew sendCoverageToCodacy -PdisablePreDex
 after_failure:
diff --git a/README.md b/README.md
index 145c6f552..fcd593174 100644
--- a/README.md
+++ b/README.md
@@ -22,5 +22,10 @@ If you don't have a concrete idea, there a few issues in the backlog with some r
 
 If you want to help improve the translations of the app you can do so at https://crowdin.com/project/mytargets
 
+## Community
+Since Google+ has closed it's doors, I created a new Slack channel for discussions etc.
+Here's an invite link. If it's no longer valid give me a ping and I'll update it.
+https://join.slack.com/t/mytargets/shared_invite/enQtNjIwMjA5OTIxMTA4LWU2ZGIzMDE3ZjUyZDU4YzZkODcxNjYwZDQ2NTkwZTE0OWI0YzZiZGU2M2U0MzBkOTc4ZjQyZmE1NzQ5MTdlODE
+
 ## Licence ##
 Released under GNU GPL V2
diff --git a/app/build.gradle b/app/build.gradle
index a41f25255..4b9d3b784 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,14 +12,17 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+plugins {
+    id 'com.android.application'
+    id 'com.github.triplet.play' version '2.2.0'
+    id 'com.getkeepsafe.dexcount'
+}
 
-apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'io.fabric'
+apply plugin: 'androidx.navigation.safeargs'
 
 android {
     compileOptions {
@@ -29,29 +32,27 @@ android {
 
     compileSdkVersion compileSdkVersionCode
 
-    playAccountConfigs {
-        defaultAccountConfig {
-            jsonFile = file('../googlePlayAndroidDeveloper.json')
-        }
-    }
-
     defaultConfig {
         applicationId 'de.dreier.mytargets'
         minSdkVersion 16
         targetSdkVersion 28
         versionCode gitVersionCode
         versionName gitVersionName
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+//        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary true
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
             }
         }
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // The following argument makes the Android Test Orchestrator run its
+        // "pm clear" command after each test invocation. This command ensures
+        // that the app's state is completely cleared between tests.
+        testInstrumentationRunnerArguments clearPackageData: 'true'
     }
 
-    // used by Room, to test migrations
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
@@ -66,6 +67,10 @@ android {
 
     signingConfigs {
         debug {
+            storeFile file('../debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
         }
 
         release {
@@ -113,6 +118,25 @@ android {
             enableSplit = false
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/ASL2.0'
+    }
+
+    useLibrary 'android.test.runner'
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
+
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+    }
 }
 
 apply from: '../tools/script-play-store.gradle'
@@ -122,24 +146,38 @@ dependencies {
 
     implementation dependencies.kotlinStdlibJdk7
 
-    implementation dependencies.supportCompat
-    implementation dependencies.supportCoreUtils
-    implementation dependencies.supportCoreUi
-    implementation dependencies.supportFragment
-    implementation dependencies.supportV13
+    implementation dependencies.androidxCore
+    implementation dependencies.androidxCoreUtils
+    implementation dependencies.androidxCoreUi
+    implementation dependencies.androidxFragment
+    implementation dependencies.androidxV13
     implementation dependencies.appCompat
-    implementation dependencies.supportDesign
-    implementation dependencies.supportAnnotations
-    implementation dependencies.supportPreference
-    implementation dependencies.supportExifInterface
+    implementation dependencies.androidxDesign
+    implementation dependencies.androidxAnnotations
+    implementation dependencies.androidxPreference
+    implementation dependencies.androidxExifInterface
     implementation dependencies.recyclerView
     implementation dependencies.cardView
-//    implementation dependencies.androidxCoreKtx
 
-    implementation dependencies.playServicesDrive
+    implementation dependencies.androidxCoreKtx
+    implementation dependencies.androidFragmentKtx
+
+    implementation dependencies.timber
+
     implementation dependencies.firebaseCore
-    implementation(dependencies.firebaseCrashlytics) {
-        transitive = true
+    implementation dependencies.firebaseCrashlytics
+
+    implementation dependencies.playServicesAuth
+    implementation(dependencies.googleHttpClientAuth) {
+//        exclude: group: 'com.google.http-client:google-http-client-apache'
+    }
+    implementation(dependencies.googleApiClientAndroid) {
+        exclude group: 'org.apache.httpcomponents'
+        exclude group: 'com.google.http-client', module: 'google-http-client-apache'
+    }
+    implementation(dependencies.googleApiServicesDrive) {
+        exclude group: 'org.apache.httpcomponents'
+        exclude group: 'com.google.http-client', module: 'google-http-client-apache'
     }
 
     implementation dependencies.gson
@@ -189,6 +227,8 @@ dependencies {
     kapt dependencies.archLifecycleCompiler
     implementation dependencies.archRoomRuntime
     kapt dependencies.archRoomCompiler
+    implementation dependencies.archNavigationFragment
+    implementation dependencies.archNavigationUi
 
     implementation project(':shared')
     wearApp project(':wearable')
@@ -198,30 +238,41 @@ dependencies {
     testImplementation dependencies.kotlinTestJunit
 
     androidTestImplementation dependencies.truth
-    androidTestImplementation dependencies.jsr305
+    androidTestImplementation dependencies.androidxTestCore
     androidTestImplementation dependencies.runner
     androidTestImplementation dependencies.rules
+    androidTestUtil dependencies.androidTestOrchestrator
     androidTestImplementation dependencies.uiAutomator
-    androidTestImplementation(dependencies.espressoCore, {
-        exclude group: 'com.android.support'
-    })
-    androidTestImplementation(dependencies.espressoContrib, {
-        exclude group: 'com.android.support'
-    })
-    androidTestImplementation(dependencies.espressoIntents, {
-        exclude group: 'com.android.support', module: 'appcompat'
-        exclude group: 'com.android.support', module: 'support-v4'
-        exclude module: 'recyclerview-v7'
-    })
+    androidTestImplementation dependencies.espressoCore
+    androidTestImplementation dependencies.espressoContrib
+    androidTestImplementation dependencies.espressoIntents
 
     implementation dependencies.espressoIdlingResource
     androidTestScreengrabImplementation dependencies.screengrab
     androidTestImplementation dependencies.archRoomTesting
+    androidTestImplementation dependencies.androidxTestExt
 
     implementation dependencies.multiDex
+
+}
+
+configurations.all {
+    exclude module: 'httpclient'
+    exclude module: 'commons-logging'
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') {
+            details.useVersion '27.0.1-android'
+        } else if (details.requested.group == 'org.checkerframework' && details.requested.name == 'checker-compat-qual') {
+            details.useVersion '2.5.5'
+        } else if (details.requested.group == 'com.google.errorprone' && details.requested.name == 'error_prone_annotations') {
+            details.useVersion '2.3.1'
+        }
+    }
 }
 
 // Must be at the bottom
 if (HAS_GMS_SECRET) {
     apply plugin: 'com.google.gms.google-services'
+} else {
+    println 'GMS secret is missing!'
 }
\ No newline at end of file
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index feb331083..1c3feeb37 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
@@ -15,16 +14,22 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="de.dreier.mytargets">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="de.dreier.mytargets">
 
-    <uses-sdk
-        android:targetSdkVersion="22"
-        android:minSdkVersion="10"
-        tools:overrideLibrary="android.support.test.uiautomator.v18"/>
+    <application android:name=".app.ApplicationInstance">
+        <uses-library
+            android:name="android.test.runner"
+            android:required="false" />
+    </application>
 
     <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
+    <uses-sdk
+        android:minSdkVersion="18"
+        android:targetSdkVersion="22"
+        tools:overrideLibrary="android_libs.ub_uiautomator" />
 
 </manifest>
diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 92c6f997f..a83e6a299 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -15,14 +15,14 @@
 
 package de.dreier.mytargets.app
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.testing.MigrationTestHelper
 import android.content.Context
-import android.support.test.InstrumentationRegistry
-import android.support.test.InstrumentationRegistry.getTargetContext
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import com.google.common.truth.Truth.assertThat
 import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.base.db.migrations.*
@@ -58,7 +58,7 @@ class MigrationTest : InstrumentedTestBase() {
     @Throws(IOException::class)
     fun setUp() {
         // Create artificial image file to ensure the according database entry is not deleted (Migration23)
-        getTargetContext()
+        getInstrumentation().targetContext
             .openFileOutput(
                 "img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg",
                 Context.MODE_PRIVATE
@@ -217,7 +217,7 @@ class MigrationTest : InstrumentedTestBase() {
 
     private fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(
-            InstrumentationRegistry.getTargetContext(),
+            getInstrumentation().targetContext,
             AppDatabase::class.java, TEST_DB_NAME
         ).addMigrations(
             Migration17, Migration18, Migration19,
diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
index 0f99ead8f..8d201c4df 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.dao
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
index a1967674a..f62623699 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.dao
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
+import androidx.room.Room
+import androidx.test.platform.app.InstrumentationRegistry
 import de.dreier.mytargets.base.db.AppDatabase
 import org.junit.After
 import org.junit.Before
@@ -27,7 +27,7 @@ abstract class DAOTestBase {
     @Before
     fun initDb() {
         appDatabase = Room.inMemoryDatabaseBuilder(
-            InstrumentationRegistry.getContext(),
+            InstrumentationRegistry.getInstrumentation().context,
             AppDatabase::class.java
         ).build()
     }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt
index 5aa2427fb..f32d8c1b8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.dao
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.db.End
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
index 6b613acc1..8357d9edf 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
@@ -17,14 +17,14 @@ package de.dreier.mytargets.features.arrow
 
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.arrows.ArrowListActivity
 import de.dreier.mytargets.features.arrows.EditArrowActivity
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
index d0cec621b..e6ed59927 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
@@ -16,13 +16,13 @@
 package de.dreier.mytargets.features.arrow
 
 
-import android.support.test.espresso.Espresso.onData
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.*
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.test.base.UITestBase
@@ -41,11 +41,12 @@ import org.junit.runner.RunWith
 class EditArrowTest : UITestBase() {
 
     private val activityTestRule = ActivityTestRule(
-            MainActivity::class.java)
+        MainActivity::class.java
+    )
 
     @get:Rule
     val rule = RuleChain.outerRule(EmptyDbTestRule())
-            .around(activityTestRule)
+        .around(activityTestRule)
 
     @Test
     fun editArrowTest() {
@@ -54,43 +55,43 @@ class EditArrowTest : UITestBase() {
         // Add new arrow and change some properties
         onView(supportFab()).perform(click())
         onView(withId(R.id.name))
-                .perform(nestedScrollTo(), replaceText("Arrow"), closeSoftKeyboard())
+            .perform(nestedScrollTo(), replaceText("Arrow"), closeSoftKeyboard())
         onView(withText(R.string.more_fields))
-                .perform(nestedScrollTo(), click())
+            .perform(nestedScrollTo(), click())
         onView(withId(R.id.length))
-                .perform(nestedScrollTo(), replaceText("Length"))
+            .perform(nestedScrollTo(), replaceText("Length"))
         onView(withId(R.id.diameter))
-                .perform(nestedScrollTo(), replaceText("680"), closeSoftKeyboard())
+            .perform(nestedScrollTo(), replaceText("680"), closeSoftKeyboard())
 
         // Attempt to save and check if error is shown
         save()
         Thread.sleep(500)
         onView(withId(R.id.diameterTextInputLayout))
-                .check(matches(hasDescendant(withText(getString(R.string.not_within_expected_range_mm)))))
+            .check(matches(hasDescendant(withText(getString(R.string.not_within_expected_range_mm)))))
 
         // Fix input
         onView(withId(R.id.diameter))
-                .perform(nestedScrollTo(), replaceText("6.8"), closeSoftKeyboard())
+            .perform(nestedScrollTo(), replaceText("6.8"), closeSoftKeyboard())
         save()
 
         Thread.sleep(500)
 
         // Check if arrow has been saved
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
-                .check(matches(hasDescendant(withText("Arrow"))))
+            .check(matches(hasDescendant(withText("Arrow"))))
 
         // Open arrow again via CAB
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
-                .perform(longClick())
+            .perform(longClick())
         clickContextualActionBarItem(R.id.action_edit, R.string.edit)
 
         // Check if properties have been saved and are shown
         onView(withId(R.id.length))
-                .check(matches(withText("Length")))
+            .check(matches(withText("Length")))
         onView(withId(R.id.diameter))
-                .check(matches(withText("6.8")))
+            .check(matches(withText("6.8")))
         onView(withId(R.id.diameterUnit))
-                .check(matches(withSpinnerText("mm")))
+            .check(matches(withSpinnerText("mm")))
 
         // Change unit to inch
         onView(withId(R.id.diameterUnit)).perform(nestedScrollTo(), click())
@@ -101,9 +102,9 @@ class EditArrowTest : UITestBase() {
 
         // Correct value and save
         onView(withId(R.id.diameterTextInputLayout))
-                .check(matches(hasDescendant(withText(R.string.not_within_expected_range_inch))))
+            .check(matches(hasDescendant(withText(R.string.not_within_expected_range_inch))))
         onView(withId(R.id.diameter))
-                .perform(nestedScrollTo(), replaceText("0.5"), closeSoftKeyboard())
+            .perform(nestedScrollTo(), replaceText("0.5"), closeSoftKeyboard())
 
         // TODO Fix camera test
         //        onView(withId(R.id.coordinatorLayout)).perform(swipeDown());
@@ -122,19 +123,19 @@ class EditArrowTest : UITestBase() {
         Thread.sleep(500)
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
-                .perform(click())
+            .perform(click())
 
         onView(withId(R.id.diameter)).check(matches(withText("0.5")))
         onView(withId(R.id.diameterUnit))
-                .check(matches(withSpinnerText("inch")))
+            .check(matches(withSpinnerText("inch")))
 
         // Change name and discard it
         onView(withId(R.id.name))
-                .perform(nestedScrollTo(), replaceText("Arrrr"), closeSoftKeyboard())
+            .perform(nestedScrollTo(), replaceText("Arrrr"), closeSoftKeyboard())
         navigateUp()
 
         // Check if arrow has not been saved
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
-                .check(matches(hasDescendant(withText("Arrow"))))
+            .check(matches(hasDescendant(withText("Arrow"))))
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
index 06a8f67c1..5591fbac9 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
@@ -17,14 +17,14 @@ package de.dreier.mytargets.features.bow
 
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.bows.BowListActivity
 import de.dreier.mytargets.features.bows.EditBowActivity
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
index bf47f35dc..25185cb76 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
@@ -16,14 +16,14 @@
 package de.dreier.mytargets.features.bow
 
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.*
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.rule.ActivityTestRule
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.test.base.UITestBase
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
index 99eb1849a..2fc1117ae 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
@@ -15,12 +15,12 @@
 
 package de.dreier.mytargets.features.main
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.test.base.UITestBase
@@ -40,16 +40,16 @@ class IntroActivityTest : UITestBase() {
 
     @get:Rule
     val rule = RuleChain.outerRule(EmptyDbTestRule())
-            .around(activityTestRule)
+        .around(activityTestRule)
 
     @Test
     fun introActivityTest() {
         onView(allOf(withId(R.id.txt_title_slide), isDisplayed()))
-                .check(matches(withText(R.string.intro_title_track_training_progress)))
+            .check(matches(withText(R.string.intro_title_track_training_progress)))
         onView(withId(R.id.button_next)).perform(click())
 
         onView(allOf(withId(R.id.txt_title_slide), isDisplayed()))
-                .check(matches(withText(R.string.intro_title_everything_in_one_place)))
+            .check(matches(withText(R.string.intro_title_everything_in_one_place)))
         onView(withId(R.id.button_next)).perform(click())
 
         onView(withId(R.id.toolbar)).check(matches(hasDescendant(withText(R.string.my_targets))))
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 4166bf1af..4a5a7c8fd 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -17,18 +17,18 @@ package de.dreier.mytargets.features.main
 
 import android.app.Activity
 import android.app.Instrumentation
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.IdlingRegistry
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.longClick
-import android.support.test.espresso.contrib.DrawerActions
-import android.support.test.espresso.contrib.NavigationViewActions
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.intending
-import android.support.test.espresso.intent.matcher.IntentMatchers.*
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.longClick
+import androidx.test.espresso.contrib.DrawerActions
+import androidx.test.espresso.contrib.NavigationViewActions
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
index 4b1ea177d..3bca59b10 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
@@ -16,18 +16,18 @@
 package de.dreier.mytargets.features.settings
 
 
-import android.support.annotation.StringRes
-import android.support.test.espresso.Espresso.onData
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
-import android.support.test.espresso.action.ViewActions.replaceText
-import android.support.test.espresso.contrib.RecyclerViewActions.scrollTo
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollTo
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.backup.provider.EBackupLocation
 import de.dreier.mytargets.shared.SharedApplicationInstance
@@ -37,22 +37,21 @@ import de.dreier.mytargets.test.utils.matchers.MatcherUtils.matchToolbarTitle
 import de.dreier.mytargets.test.utils.matchers.ParentViewMatcher.isOnForegroundFragment
 import de.dreier.mytargets.test.utils.matchers.ViewMatcher.clickOnPreference
 import org.hamcrest.Matchers.*
-import org.junit.After
+import org.junit.*
 import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
 
 @RunWith(AndroidJUnit4::class)
+@Ignore
 class SettingsActivityTest : UITestBase() {
 
     @get:Rule
     var activityTestRule = ActivityTestRule(
-            SettingsActivity::class.java)
+        SettingsActivity::class.java
+    )
 
     private val activity: SettingsActivity
         get() = activityTestRule.activity
@@ -60,9 +59,9 @@ class SettingsActivityTest : UITestBase() {
     @Before
     fun setUp() {
         SharedApplicationInstance.sharedPreferences
-                .edit()
-                .clear()
-                .apply()
+            .edit()
+            .clear()
+            .apply()
         SettingsManager.inputTargetZoom = 3.0f
         SettingsManager.inputArrowDiameterScale = 1.0f
         SettingsManager.backupLocation = EBackupLocation.INTERNAL_STORAGE
@@ -88,8 +87,10 @@ class SettingsActivityTest : UITestBase() {
 
         clickOnPreference(R.string.birthday)
         enterDate(1990, 2, 11)
-        matchPreferenceSummary(R.string.birthday, DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
-                .format(LocalDate.of(1990, 2, 11)))
+        matchPreferenceSummary(
+            R.string.birthday, DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
+                .format(LocalDate.of(1990, 2, 11))
+        )
 
         clickOnPreference(R.string.club)
         enterText("Archery Club")
@@ -130,14 +131,20 @@ class SettingsActivityTest : UITestBase() {
         clickOnPreference(R.string.timer)
         matchToolbarTitle(activity.getString(R.string.timer))
 
-        matchPreferenceSummary(R.string.timer_waiting_time, activity
-                .resources.getQuantityString(R.plurals.second, 20, 20))
+        matchPreferenceSummary(
+            R.string.timer_waiting_time, activity
+                .resources.getQuantityString(R.plurals.second, 20, 20)
+        )
 
-        matchPreferenceSummary(R.string.timer_shooting_time, activity
-                .resources.getQuantityString(R.plurals.second, 120, 120))
+        matchPreferenceSummary(
+            R.string.timer_shooting_time, activity
+                .resources.getQuantityString(R.plurals.second, 120, 120)
+        )
 
-        matchPreferenceSummary(R.string.timer_warning_time, activity
-                .resources.getQuantityString(R.plurals.second, 30, 30))
+        matchPreferenceSummary(
+            R.string.timer_warning_time, activity
+                .resources.getQuantityString(R.plurals.second, 30, 30)
+        )
 
         pressBack()
 
@@ -159,28 +166,32 @@ class SettingsActivityTest : UITestBase() {
     @After
     fun tearDown() {
         SharedApplicationInstance.sharedPreferences
-                .edit()
-                .clear()
-                .apply()
+            .edit()
+            .clear()
+            .apply()
     }
 
     private fun enterText(text: String) {
         onView(withId(android.R.id.edit))
-                .perform(replaceText(text), closeSoftKeyboard())
-
-        onView(allOf(withId(android.R.id.button1), withText(android.R.string.ok),
-                isDisplayed())).perform(click())
+            .perform(replaceText(text), closeSoftKeyboard())
+
+        onView(
+            allOf(
+                withId(android.R.id.button1), withText(android.R.string.ok),
+                isDisplayed()
+            )
+        ).perform(click())
     }
 
     private fun selectFromList(text: String) {
         onData(hasToString(startsWith(text)))
-                .inAdapterView(withId(R.id.select_dialog_listview))
-                .perform(click())
+            .inAdapterView(withId(R.id.select_dialog_listview))
+            .perform(click())
     }
 
     private fun matchPreferenceSummary(@StringRes text: Int, expectedSummary: String) {
-        onView(allOf(withId(R.id.list), isOnForegroundFragment()))
-                .perform(scrollTo<RecyclerView.ViewHolder>(hasDescendant(withText(text))))
-                .check(itemHasSummary(text, expectedSummary))
+        onView(allOf(withId(android.R.id.list), isOnForegroundFragment()))
+            .perform(scrollTo<RecyclerView.ViewHolder>(hasDescendant(withText(text))))
+            .check(itemHasSummary(text, expectedSummary))
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
index df9f09f59..d09fde0a4 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.features.settings
 
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
-import android.support.v4.util.LongSparseArray
+import androidx.collection.LongSparseArray
+import androidx.test.filters.SmallTest
+import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.EBackupInterval
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
index a005487be..e5d8fc99e 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.features.statistics
 
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.test.base.InstrumentedTestBase
 import de.dreier.mytargets.test.utils.rules.MiniDbTestRule
@@ -39,53 +39,54 @@ class ExportTest : InstrumentedTestBase() {
     fun testDataExport() {
         val writer = StringWriter()
         val roundIds = ApplicationInstance.db.trainingDAO().loadTrainings()
-                .flatMap { ApplicationInstance.db.roundDAO().loadRounds(it.id) }
-                .map { it.id }
-                .sorted()
-                .toMutableList()
+            .flatMap { ApplicationInstance.db.roundDAO().loadRounds(it.id) }
+            .map { it.id }
+            .sorted()
+            .toMutableList()
         roundIds.removeAt(0)
         CsvExporter(getInstrumentation().targetContext, ApplicationInstance.db)
-                .writeExportData(writer, roundIds)
+            .writeExportData(writer, roundIds)
         Assert.assertEquals(EXPECTED, writer.toString())
     }
 
     companion object {
-        private const val EXPECTED = "\"Title\";\"Date\";\"Standard round\";\"Indoor\";\"Bow\";\"Arrow\";\"Round\";\"Distance\";\"Target\";\"End\";\"Timestamp\";\"Points\";\"x\";\"y\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"9\";\"-0.19679837\";\"-0.054444958\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"7\";\"-0.35070917\";\"0.21802907\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"5\";\"0.1591012\";\"-0.6074063\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"5\";\"-0.34579107\";\"-0.47265264\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"7\";\"0.20607667\";\"-0.37253922\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"6\";\"-0.43094382\";\"-0.17701732\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"1\";\"0.07179225\";\"0.99751586\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"9\";\"-0.19982919\";\"0.11988278\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"6\";\"0.49992648\";\"0.05285425\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"9\";\"0.113363184\";\"-0.13224195\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"10\";\"0.025195435\";\"-0.118830875\"\n" +
-                "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"4\";\"-0.26668936\";\"0.61415976\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"1\";\"-0.5778972\";\"0.7959325\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"6\";\"-0.28520566\";\"-0.4321238\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"10\";\"-0.044608343\";\"-0.12625475\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"7\";\"-0.24878271\";\"-0.25027454\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"3\";\"-0.62481874\";\"-0.4338018\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"X\";\"-0.028194645\";\"0.07728534\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"5\";\"-0.08748839\";\"-0.62123376\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"7\";\"-0.2658152\";\"0.29600945\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"X\";\"-0.02324394\";\"-0.056518044\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"8\";\"-0.23567894\";\"-0.17782852\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"5\";\"0.20571919\";\"-0.5271199\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"9\";\"-0.21914628\";\"-0.057659067\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"5\";\"0.54042196\";\"0.27746376\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"2\";\"-0.86734706\";\"-0.32767305\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"6\";\"0.51952213\";\"0.014782413\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"9\";\"-0.23790026\";\"-0.036906872\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"10\";\"0.10485902\";\"-0.017559964\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"4\";\"0.24249218\";\"-0.7027249\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"9\";\"0.11511669\";\"-0.18904422\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"M\";\"0.8259577\";\"-0.7482542\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"8\";\"-0.15863813\";\"0.20996018\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"6\";\"0.0089092525\";\"0.5021496\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"10\";\"-0.029776974\";\"-0.13108598\"\n" +
-                "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"6\";\"-0.30494335\";\"0.3902735\"\n"
+        private const val EXPECTED =
+            "\"Title\";\"Date\";\"Standard round\";\"Indoor\";\"Bow\";\"Arrow\";\"Round\";\"Distance\";\"Target\";\"End\";\"Timestamp\";\"Points\";\"x\";\"y\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"9\";\"-0.19679837\";\"-0.054444958\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"7\";\"-0.35070917\";\"0.21802907\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"5\";\"0.1591012\";\"-0.6074063\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"5\";\"-0.34579107\";\"-0.47265264\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"7\";\"0.20607667\";\"-0.37253922\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:18:42\";\"6\";\"-0.43094382\";\"-0.17701732\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"1\";\"0.07179225\";\"0.99751586\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"9\";\"-0.19982919\";\"0.11988278\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"6\";\"0.49992648\";\"0.05285425\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"9\";\"0.113363184\";\"-0.13224195\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"10\";\"0.025195435\";\"-0.118830875\"\n" +
+                    "\"Training\";\"2016-07-03\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:33:36\";\"4\";\"-0.26668936\";\"0.61415976\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"1\";\"-0.5778972\";\"0.7959325\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"6\";\"-0.28520566\";\"-0.4321238\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"10\";\"-0.044608343\";\"-0.12625475\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"7\";\"-0.24878271\";\"-0.25027454\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"3\";\"-0.62481874\";\"-0.4338018\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"1\";\"14:09:22\";\"X\";\"-0.028194645\";\"0.07728534\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"5\";\"-0.08748839\";\"-0.62123376\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"7\";\"-0.2658152\";\"0.29600945\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"X\";\"-0.02324394\";\"-0.056518044\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"8\";\"-0.23567894\";\"-0.17782852\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"5\";\"0.20571919\";\"-0.5271199\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"1\";\"50m\";\"WA Full (122cm)\";\"2\";\"14:54:25\";\"9\";\"-0.21914628\";\"-0.057659067\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"5\";\"0.54042196\";\"0.27746376\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"2\";\"-0.86734706\";\"-0.32767305\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"6\";\"0.51952213\";\"0.014782413\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"9\";\"-0.23790026\";\"-0.036906872\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"10\";\"0.10485902\";\"-0.017559964\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"1\";\"14:12:29\";\"4\";\"0.24249218\";\"-0.7027249\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"9\";\"0.11511669\";\"-0.18904422\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"M\";\"0.8259577\";\"-0.7482542\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"8\";\"-0.15863813\";\"0.20996018\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"6\";\"0.0089092525\";\"0.5021496\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"10\";\"-0.029776974\";\"-0.13108598\"\n" +
+                    "\"Training\";\"2016-05-02\";\"WA Standard\";\"Outdoor\";\"\";\"\";\"2\";\"30m\";\"WA Full (122cm)\";\"2\";\"14:48:12\";\"6\";\"-0.30494335\";\"0.3902735\"\n"
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
index 437e3ad65..cb962b3a7 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
@@ -16,13 +16,13 @@
 package de.dreier.mytargets.features.statistics
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withParent
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.test.base.UITestBase
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
index 52ed1f7e3..84e827a14 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
@@ -15,19 +15,19 @@
 
 package de.dreier.mytargets.features.training
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.longClick
-import android.support.test.espresso.assertion.ViewAssertions
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.filters.LargeTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.longClick
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.test.base.UITestBase
@@ -50,61 +50,77 @@ class DeleteTest : UITestBase() {
 
     @get:Rule
     val rule = RuleChain.outerRule(SimpleDbTestRule())
-            .around(activityTestRule)
+        .around(activityTestRule)
 
     @Test
     @Throws(Exception::class)
     fun testDeleteRound() {
         // Expand july
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click())
+        )
 
         // Delete and undo deletion
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(1, longClick()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(1, longClick())
+        )
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click())
+        )
         clickContextualActionBarItem(R.id.action_delete, R.string.delete)
         onView(withId(R.id.snackbar_action)).perform(click())
 
         // Delete training
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(3, longClick()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(3, longClick())
+        )
         clickContextualActionBarItem(R.id.action_delete, R.string.delete)
         val trainingText = activityTestRule
-                .activity.resources.getQuantityString(R.plurals.training_deleted, 1, 1)
+            .activity.resources.getQuantityString(R.plurals.training_deleted, 1, 1)
         onView(withId(R.id.snackbar_text)).check(matches(withText(trainingText)))
 
         // Open training
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
+        )
         onView(allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(1, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(1, click())
+        )
         onView(withText("Aug 22, 2016")).check(matches(isDisplayed()))
 
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(0, longClick()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(0, longClick())
+        )
         clickContextualActionBarItem(R.id.action_delete, R.string.delete)
 
         // Open round
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
+        )
 
         // Delete ends and undo
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(2, longClick()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(2, longClick())
+        )
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click())
+        )
         clickContextualActionBarItem(R.id.action_delete, R.string.delete)
         val endsText = activityTestRule
-                .activity.resources.getQuantityString(R.plurals.passe_deleted, 2, 2)
+            .activity.resources.getQuantityString(R.plurals.passe_deleted, 2, 2)
         onView(withId(R.id.snackbar_text)).check(matches(withText(endsText)))
         onView(withId(R.id.snackbar_action)).perform(click())
 
         // Delete ends
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(1, longClick()))
-        onView(withId(R.id.recyclerView)).perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(1, longClick())
+        )
+        onView(withId(R.id.recyclerView)).perform(
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(
+                3,
+                click()
+            )
+        )
         clickContextualActionBarItem(R.id.action_delete, R.string.delete)
 
         onView(withId(R.id.snackbar_text)).check(matches(withText(endsText)))
@@ -112,13 +128,14 @@ class DeleteTest : UITestBase() {
         pressBack()
 
         onView(withId(R.id.recyclerView)).perform(
-                actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+            actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
+        )
 
         onView(withId(R.id.recyclerView)).check(itemCount(`is`(4)))
 
         pressBack()
         onView(allOf(isAssignableFrom(Toolbar::class.java), withId(R.id.toolbar)))
-                .check(ViewAssertions.matches(withToolbarTitle(`is`(getString(R.string.training)))))
+            .check(ViewAssertions.matches(withToolbarTitle(`is`(getString(R.string.training)))))
         pressBack()
         matchToolbarTitle(getString(R.string.my_targets))
     }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
index 3185baf0d..5270d954c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
@@ -17,16 +17,16 @@ package de.dreier.mytargets.features.training
 
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.*
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.replaceText
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.widget.RecyclerView
+import androidx.test.espresso.Espresso.*
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.recyclerview.widget.RecyclerView
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingActivity
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index fee4505e6..3f1ec806e 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -18,16 +18,16 @@ package de.dreier.mytargets.features.training
 import android.app.Activity
 import android.app.Instrumentation
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.intending
-import android.support.test.espresso.intent.matcher.IntentMatchers.*
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.preference.PreferenceFragmentCompat
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.preference.PreferenceFragmentCompat
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.scoreboard.ScoreboardActivity
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
index 2dd9c9683..8a8c7d55c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
@@ -16,12 +16,12 @@
 package de.dreier.mytargets.features.training
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.hasDescendant
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
index f545e9f59..5ea47e29d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
@@ -15,13 +15,13 @@
 package de.dreier.mytargets.features.training.input
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
-import android.support.test.uiautomator.UiObjectNotFoundException
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiObjectNotFoundException
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -45,22 +45,26 @@ import java.util.*
 class InputActivityTest : UITestBase() {
 
     private val activityTestRule = ActivityTestRule(
-            InputActivity::class.java, true, false)
+        InputActivity::class.java, true, false
+    )
 
     @get:Rule
     val rule: RuleChain = RuleChain.outerRule(object : DbTestRuleBase() {
         override fun addDatabaseContent() {
             val generator = Random(3435)
-            val standardRound = ApplicationInstance.db.standardRoundDAO().loadStandardRoundOrNull(32L)
+            val standardRound =
+                ApplicationInstance.db.standardRoundDAO().loadStandardRoundOrNull(32L)
 
             val (id) = saveDefaultTraining(standardRound!!.id, generator)
 
-            round = Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[0])
+            round =
+                Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[0])
             round.trainingId = id
             round.comment = ""
             ApplicationInstance.db.roundDAO().insertRound(round)
 
-            val round2 = Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[1])
+            val round2 =
+                Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[1])
             round2.trainingId = id
             round2.comment = ""
             ApplicationInstance.db.roundDAO().insertRound(round2)
@@ -85,9 +89,9 @@ class InputActivityTest : UITestBase() {
         activityTestRule.launchActivity(i)
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickVirtualButton("10"))
+            .perform(TargetViewActions.clickVirtualButton("10"))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 1: 10"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 1: 10"))
 
         clickActionBarItem(R.id.action_settings, R.string.preferences)
         clickOnPreference(R.string.keyboard_enabled)
@@ -103,39 +107,39 @@ class InputActivityTest : UITestBase() {
         //assertVirtualViewNotExists("10");
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(0f, 0f))
+            .perform(TargetViewActions.clickTarget(0f, 0f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 2: X"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 2: X"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickVirtualButton("Backspace"))
+            .perform(TargetViewActions.clickVirtualButton("Backspace"))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonNotExists("Shot 2: X"))
+            .check(TargetViewAssertions.virtualButtonNotExists("Shot 2: X"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(0.1f, 0.2f))
+            .perform(TargetViewActions.clickTarget(0.1f, 0.2f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 2: 8"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 2: 8"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(0f, 0f))
+            .perform(TargetViewActions.clickTarget(0f, 0f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 3: X"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 3: X"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(-0.9f, -0.9f))
+            .perform(TargetViewActions.clickTarget(-0.9f, -0.9f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 4: Miss"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 4: Miss"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(0f, 0f))
+            .perform(TargetViewActions.clickTarget(0f, 0f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 5: X"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 5: X"))
 
         onView(withId(R.id.targetViewContainer))
-                .perform(TargetViewActions.clickTarget(0f, 0f))
+            .perform(TargetViewActions.clickTarget(0f, 0f))
         onView(withId(R.id.targetViewContainer))
-                .check(TargetViewAssertions.virtualButtonExists("Shot 6: X"))
+            .check(TargetViewAssertions.virtualButtonExists("Shot 6: X"))
 
         onView(withId(R.id.next)).perform(click())
     }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
index 6c876a73c..f8ccfdf4e 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
@@ -17,16 +17,16 @@ package de.dreier.mytargets.features.training.standardround
 
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.scrollTo
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.runner.AndroidJUnit4
-import android.support.v7.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.recyclerview.widget.RecyclerView
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingActivity
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
index 1f0c90b75..118ced11a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
@@ -16,15 +16,15 @@
 package de.dreier.mytargets.features.training.standardround
 
 import android.content.Intent
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.*
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.runner.AndroidJUnit4
-import android.support.v4.util.LongSparseArray
-import android.support.v7.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.collection.LongSparseArray
+import androidx.recyclerview.widget.RecyclerView
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.navigation.NavigationController
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
index 16984005d..0801cdad8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
@@ -16,19 +16,20 @@
 package de.dreier.mytargets.test.base
 
 import android.os.Environment
-import android.support.annotation.IdRes
-import android.support.annotation.StringRes
-import android.support.test.InstrumentationRegistry
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.ViewActions
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.pressBack
-import android.support.test.espresso.contrib.PickerActions
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.test.uiautomator.UiDevice
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.contrib.PickerActions
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.uiautomator.UiDevice
 import android.widget.DatePicker
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -62,10 +63,10 @@ abstract class UITestBase : InstrumentedTestBase() {
             val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
             val filename = (description!!.className.replace(".*\\.([^.]+)".toRegex(), "$1")
                     + "-" + description.methodName)
-            device.takeScreenshot(File(path, filename + ".png"))
+            device.takeScreenshot(File(path, "$filename.png"))
 
             try {
-                device.dumpWindowHierarchy(File(path, filename + ".txt"))
+                device.dumpWindowHierarchy(File(path, "$filename.txt"))
             } catch (e1: IOException) {
                 e1.printStackTrace()
             }
@@ -74,7 +75,7 @@ abstract class UITestBase : InstrumentedTestBase() {
     }
 
     protected fun clickActionBarItem(@IdRes menuItem: Int, @StringRes title: Int) {
-        onView(withId(menuItem)).withFailureHandler { _, _ ->
+        Espresso.onView(withId(menuItem)).withFailureHandler { _, _ ->
             openActionBarOverflowOrOptionsMenu(getInstrumentation().targetContext)
             onView(withText(title)).perform(click())
         }.perform(click())
@@ -101,7 +102,7 @@ abstract class UITestBase : InstrumentedTestBase() {
 
 
     protected fun getString(@StringRes resString: Int): String {
-        return InstrumentationRegistry.getTargetContext().getString(resString)
+        return InstrumentationRegistry.getInstrumentation().targetContext.getString(resString)
     }
 
     protected fun navigateUp() {
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
index e23ba7576..8ef2e1b1b 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
@@ -21,7 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.provider.MediaStore
-import android.support.test.runner.intent.IntentStubberRegistry
+import androidx.test.runner.intent.IntentStubberRegistry
 import java.io.IOException
 
 object ImageCaptureStubbingUtils {
@@ -48,7 +48,7 @@ object ImageCaptureStubbingUtils {
             val testResources = context.resources
             val inputStream = testResources.openRawResource(mockedImage)
             val outputStream = context.contentResolver
-                    .openOutputStream(uriToSaveImage)
+                .openOutputStream(uriToSaveImage)
             inputStream.copyTo(outputStream)
         } catch (e: IOException) {
             e.printStackTrace()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
index b15e55905..eba4428fa 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
@@ -18,11 +18,11 @@ package de.dreier.mytargets.test.utils
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Build
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.uiautomator.UiDevice
-import android.support.test.uiautomator.UiObjectNotFoundException
-import android.support.test.uiautomator.UiSelector
-import android.support.v4.content.ContextCompat
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObjectNotFoundException
+import androidx.test.uiautomator.UiSelector
+import androidx.core.content.ContextCompat
 
 object PermissionGranter {
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
index a70b53287..d19999cb5 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
@@ -17,14 +17,14 @@ package de.dreier.mytargets.test.utils.actions
 
 import android.graphics.Matrix
 import android.graphics.RectF
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.MotionEvents
-import android.support.test.espresso.action.Press
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
 import android.view.MotionEvent
 import android.view.View
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.MotionEvents
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
+import androidx.test.platform.app.InstrumentationRegistry
 import de.dreier.mytargets.shared.targets.drawable.TargetDrawable
 import org.hamcrest.Matcher
 
@@ -49,8 +49,8 @@ object LowLevelActions {
         val contentWidth = v.width.toFloat()
         val contentHeight = v.height.toFloat()
 
-        val density = InstrumentationRegistry.getTargetContext().resources
-                .displayMetrics.density
+        val density = InstrumentationRegistry.getInstrumentation().targetContext.resources
+            .displayMetrics.density
 
         val targetRectExt = RectF(0f, 80 * density, contentWidth, contentHeight)
         targetRectExt.inset(10 * density, 10 * density)
@@ -61,7 +61,7 @@ object LowLevelActions {
         targetRectExt.inset(30 * density, 30 * density)
         val fullExtendedMatrix = Matrix()
         fullExtendedMatrix
-                .setRectToRect(TargetDrawable.SRC_RECT, targetRectExt, Matrix.ScaleToFit.CENTER)
+            .setRectToRect(TargetDrawable.SRC_RECT, targetRectExt, Matrix.ScaleToFit.CENTER)
 
         val shotPos = FloatArray(2)
         fullExtendedMatrix.mapPoints(shotPos, coordinates)
@@ -78,7 +78,8 @@ object LowLevelActions {
         return coordinates
     }
 
-    class PressAndHoldAction internal constructor(internal val coordinates: FloatArray) : ViewAction {
+    class PressAndHoldAction internal constructor(internal val coordinates: FloatArray) :
+        ViewAction {
 
         override fun getConstraints(): Matcher<View> {
             return isDisplayingAtLeast(90)
@@ -95,8 +96,10 @@ object LowLevelActions {
 
             val precision = Press.FINGER.describePrecision()
             sMotionEventDownHeldView = MotionEvents
-                    .sendDown(uiController, getTargetCoordinates(view, coordinates),
-                            precision).down
+                .sendDown(
+                    uiController, getTargetCoordinates(view, coordinates),
+                    precision
+                ).down
             // TODO: save view information and make sure release() is on same view
 
         }
@@ -115,11 +118,14 @@ object LowLevelActions {
         override fun perform(uiController: UiController, view: View) {
             if (sMotionEventDownHeldView == null) {
                 throw AssertionError(
-                        "Before calling release(), you must call pressAndHold() on a view")
+                    "Before calling release(), you must call pressAndHold() on a view"
+                )
             }
 
-            MotionEvents.sendUp(uiController, sMotionEventDownHeldView!!,
-                    getTargetCoordinates(view, coordinates))
+            MotionEvents.sendUp(
+                uiController, sMotionEventDownHeldView!!,
+                getTargetCoordinates(view, coordinates)
+            )
         }
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
index cb1a3fe0e..8ff0db1af 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
@@ -16,13 +16,13 @@
 package de.dreier.mytargets.test.utils.actions
 
 import android.graphics.Rect
-import android.support.test.espresso.PerformException
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.matcher.ViewMatchers
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
-import android.support.test.espresso.util.HumanReadables
-import android.support.v4.widget.NestedScrollView
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
+import androidx.test.espresso.util.HumanReadables
+import androidx.core.widget.NestedScrollView
 import android.view.View
 import android.widget.HorizontalScrollView
 import android.widget.ScrollView
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
index b4775d479..2d60831af 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.test.utils.actions
 
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.CoordinatesProvider
-import android.support.test.espresso.action.GeneralClickAction
-import android.support.test.espresso.action.Press
-import android.support.test.espresso.action.Tap
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralClickAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Tap
 import de.dreier.mytargets.features.training.input.TargetView
 import org.junit.Assert.assertNotNull
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
index 63f8f2454..2992a4992 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.test.utils.assertions
 
-import android.support.annotation.StringRes
-import android.support.test.espresso.ViewAssertion
-import android.support.test.espresso.matcher.ViewMatchers.assertThat
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.StringRes
+import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.View.FIND_VIEWS_WITH_TEXT
 import android.widget.TextView
@@ -35,7 +35,7 @@ object RecyclerViewAssertions {
             }
 
             val recyclerView = view as RecyclerView
-            val adapter = recyclerView.adapter
+            val adapter = recyclerView.adapter!!
             assertThat(adapter.itemCount, matcher)
         }
     }
@@ -48,7 +48,7 @@ object RecyclerViewAssertions {
             val rv = view
             val outviews = ArrayList<View>()
             val title = view.getContext().getString(item)
-            for (index in 0 until rv.adapter.itemCount) {
+            for (index in 0 until rv.adapter!!.itemCount) {
                 val viewHolder = rv.findViewHolderForAdapterPosition(index) ?: continue
                 val itemView = viewHolder.itemView
                 itemView.findViewsWithText(outviews, title, FIND_VIEWS_WITH_TEXT)
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
index e63cfdcb4..b7146b2ec 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.test.utils.assertions
 
-import android.support.test.espresso.ViewAssertion
+import androidx.test.espresso.ViewAssertion
 import de.dreier.mytargets.features.training.input.TargetView
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
index 35677e2f9..04d1bacba 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
@@ -16,9 +16,9 @@
 package de.dreier.mytargets.test.utils.matchers
 
 import android.content.Intent
-import android.support.test.espresso.intent.matcher.ComponentNameMatchers.hasClassName
-import android.support.test.espresso.intent.matcher.ComponentNameMatchers.hasMyPackageName
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.matcher.ComponentNameMatchers.hasClassName
+import androidx.test.espresso.intent.matcher.ComponentNameMatchers.hasMyPackageName
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Description
 import org.hamcrest.Matcher
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
index 43289c625..0002a57d5 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
@@ -16,12 +16,12 @@
 package de.dreier.mytargets.test.utils.matchers
 
 import android.content.res.Resources
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.ViewInteraction
-import android.support.test.espresso.assertion.ViewAssertions
-import android.support.test.espresso.matcher.BoundedMatcher
-import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import android.support.v7.widget.Toolbar
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.BoundedMatcher
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
index ac369927a..bb842b154 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.test.utils.matchers
 
-import android.support.annotation.IdRes
+import androidx.annotation.IdRes
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.views.speeddial.FabSpeedDial
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
index 416d28d73..66d74dc83 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
@@ -16,8 +16,8 @@
 package de.dreier.mytargets.test.utils.matchers
 
 import android.content.res.Resources
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.v7.widget.RecyclerView
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Description
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
index 50076108a..245003fcc 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
@@ -15,16 +15,16 @@
 
 package de.dreier.mytargets.test.utils.matchers
 
-import android.support.annotation.IdRes
-import android.support.annotation.StringRes
-import android.support.design.widget.FloatingActionButton
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import android.support.test.espresso.matcher.ViewMatchers.*
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
 import android.view.View
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.matcher.ViewMatchers.*
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import de.dreier.mytargets.R
 import de.dreier.mytargets.test.utils.matchers.ParentViewMatcher.isOnForegroundFragment
 import de.dreier.mytargets.test.utils.matchers.ParentViewMatcher.withSpeedDialItem
@@ -34,8 +34,9 @@ import org.hamcrest.Matchers
 
 object ViewMatcher {
     fun androidHomeMatcher(): Matcher<View> {
-        return allOf(withParent(withClassName(`is`(Toolbar::class.java.name))),
-                withClassName(containsString("ImageButton"))
+        return allOf(
+            withParent(withClassName(`is`(Toolbar::class.java.name))),
+            withClassName(containsString("ImageButton"))
         )
     }
 
@@ -44,12 +45,12 @@ object ViewMatcher {
     }
 
     fun clickFabSpeedDialItem(@IdRes id: Int) {
-        onView(ViewMatcher.supportFab()).perform(click())
+        onView(supportFab()).perform(click())
         onView(withSpeedDialItem(withId(R.id.fabSpeedDial), id)).perform(click())
     }
 
     fun clickOnPreference(@StringRes text: Int) {
-        onView(Matchers.allOf(withId(R.id.list), isOnForegroundFragment()))
-                .perform(actionOnItem<RecyclerView.ViewHolder>(hasDescendant(withText(text)), click()))
+        onView(Matchers.allOf(withId(android.R.id.list), isOnForegroundFragment()))
+            .perform(actionOnItem<RecyclerView.ViewHolder>(hasDescendant(withText(text)), click()))
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index e50b839be..e10235b14 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.test.utils.rules
 
 import android.content.Context
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.AppDatabase
@@ -38,7 +38,7 @@ import java.io.IOException
 import java.util.*
 
 abstract class DbTestRuleBase : TestRule {
-    private val context: Context = InstrumentationRegistry.getTargetContext()
+    private val context: Context = InstrumentationRegistry.getInstrumentation().targetContext
 
     override fun apply(base: Statement, description: Description): Statement {
         return object : Statement() {
@@ -50,7 +50,8 @@ abstract class DbTestRuleBase : TestRule {
                 base.evaluate()
                 try {
                     ApplicationInstance.db.close()
-                } catch (e: IOException) {}
+                } catch (e: IOException) {
+                }
             }
         }
     }
@@ -116,7 +117,8 @@ abstract class DbTestRuleBase : TestRule {
 
     protected fun saveDefaultTraining(standardRoundId: Long?, generator: Random): Training {
         val training = Training()
-        training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
+        training.title =
+            InstrumentationRegistry.getInstrumentation().targetContext.getString(R.string.training)
         training.date = LocalDate.of(2016, 4 + generator.nextInt(5), generator.nextInt(29))
         training.environment.location = ""
         training.environment.weather = EWeather.SUNNY
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 9fcf80eb5..ac9ad787d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.test.utils.rules
 
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -92,7 +92,8 @@ class SimpleDbTestRule : DbTestRuleBase() {
     private fun getRoundTemplate(index: Int, distance: Int): RoundTemplate {
         val roundTemplate = RoundTemplate()
         roundTemplate.index = index
-        roundTemplate.targetTemplate = Target(WAFull.ID, 0, Dimension(60f, Dimension.Unit.CENTIMETER))
+        roundTemplate.targetTemplate =
+            Target(WAFull.ID, 0, Dimension(60f, Dimension.Unit.CENTIMETER))
         roundTemplate.shotsPerEnd = 6
         roundTemplate.endCount = 6
         roundTemplate.distance = Dimension(distance.toFloat(), Dimension.Unit.METER)
@@ -101,7 +102,8 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
+        val standardRound =
+            ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
 
         val training = saveDefaultTraining(standardRound.id, generator)
 
@@ -127,10 +129,12 @@ class SimpleDbTestRule : DbTestRuleBase() {
     }
 
     private fun addFullTraining(bow: Bow) {
-        val standardRound = ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
+        val standardRound =
+            ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
 
         val training = Training()
-        training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
+        training.title =
+            InstrumentationRegistry.getInstrumentation().targetContext.getString(R.string.training)
         training.date = LocalDate.of(2016, 7, 15)
         training.environment.weather = EWeather.SUNNY
         training.environment.windSpeed = 1
diff --git a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
index bf61b9bcd..5db836e71 100644
--- a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
+++ b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
@@ -1,15 +1,15 @@
 package de.dreier.mytargets.screengrab
 
 import android.os.SystemClock
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.contrib.RecyclerViewActions
-import android.support.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.*
 import android.support.test.filters.LargeTest
 import android.support.test.filters.SdkSuppress
 import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import de.dreier.mytargets.R
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 75939bec0..45d55e4b4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -299,7 +299,7 @@
             android:label="@string/help"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt b/app/src/main/java/androidx/recyclerview/widget/RebindReportingHolder.kt
similarity index 85%
rename from app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt
rename to app/src/main/java/androidx/recyclerview/widget/RebindReportingHolder.kt
index cc94c7fd2..754c37066 100644
--- a/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt
+++ b/app/src/main/java/androidx/recyclerview/widget/RebindReportingHolder.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package android.support.v7.widget
+package androidx.recyclerview.widget
 
 import android.view.View
 
@@ -58,11 +58,13 @@ abstract class RebindReportingHolder(itemView: View) : RecyclerView.ViewHolder(i
      * @return
      */
     private fun isRelevantFlagSet(flag: Int): Boolean {
-        return intArrayOf(RecyclerView.ViewHolder.FLAG_BOUND,
-                RecyclerView.ViewHolder.FLAG_INVALID,
-                RecyclerView.ViewHolder.FLAG_UPDATE,
-                RecyclerView.ViewHolder.FLAG_RETURNED_FROM_SCRAP)
-                .any { (flag and it) == it }
+        return intArrayOf(
+            RecyclerView.ViewHolder.FLAG_BOUND,
+            RecyclerView.ViewHolder.FLAG_INVALID,
+            RecyclerView.ViewHolder.FLAG_UPDATE,
+            RecyclerView.ViewHolder.FLAG_RETURNED_FROM_SCRAP
+        )
+            .any { (flag and it) == it }
     }
 
     internal override fun offsetPosition(offset: Int, applyToPreLayout: Boolean) {
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index d36031d48..9cf92dca5 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -15,12 +15,13 @@
 
 package de.dreier.mytargets.app
 
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
-import android.support.multidex.MultiDex
+import androidx.multidex.MultiDex
 import android.util.Log
+import androidx.room.RoomDatabase
 import com.crashlytics.android.Crashlytics
 import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.BuildConfig
diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
index 49fd221a5..cd471bd60 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
@@ -16,8 +16,8 @@
 package de.dreier.mytargets.base.activities
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import android.view.MenuItem
 import com.google.firebase.analytics.FirebaseAnalytics
 import de.dreier.mytargets.base.navigation.NavigationController
diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
index cc71c2441..7ef078dc2 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
@@ -17,12 +17,12 @@ package de.dreier.mytargets.base.activities
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 abstract class SimpleFragmentActivityBase : ChildActivityBase() {
 
     val childFragment: Fragment
-        get() = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)
+        get() = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)!!
 
     protected abstract fun instantiateFragment(): Fragment
 
@@ -54,7 +54,7 @@ abstract class SimpleFragmentActivityBase : ChildActivityBase() {
         }
 
         supportFragmentManager.beginTransaction()
-            .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
+            .replace(android.R.id.content, childFragment!!, FRAGMENT_TAG)
             .commit()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
index 1f868805f..eb0d05788 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.adapters
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 
 abstract class ListAdapterBase<S : RecyclerView.ViewHolder, T> : RecyclerView.Adapter<S>() {
     abstract fun removeItem(item: T)
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
index 3cbdc91ba..b65d77b54 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
@@ -15,12 +15,12 @@
 
 package de.dreier.mytargets.base.adapters.dynamicitem
 
-import android.support.annotation.StringRes
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.snackbar.Snackbar
 import de.dreier.mytargets.R
 
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
index 3691c2b4e..74afb0491 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.adapters.dynamicitem
 
-import android.support.v4.app.Fragment
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 
 abstract class DynamicItemHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
index 2118cc58c..f5d35075d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import de.dreier.mytargets.base.db.dao.*
 import de.dreier.mytargets.base.db.typeconverters.*
 import de.dreier.mytargets.shared.models.db.*
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
index 8a6075b56..a9203151b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.base.db
 
+import androidx.room.RoomDatabase
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
index c551e829c..b1e8ba6a2 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db
 
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.RoomDatabase
 import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.db.dao.SignatureDAO
 import de.dreier.mytargets.base.db.dao.TrainingDAO
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index e8cd9c2db..1c8bfba0e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.*
+import androidx.lifecycle.LiveData
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index bdfa2cfa2..8036de7d0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.SightMark
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
index 918d0104d..c3028efd8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.lifecycle.LiveData
 import de.dreier.mytargets.shared.models.Dimension
 
 @Dao
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 506c45fe0..cef44ba7c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.db.Shot
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
index ad93834a1..472057ac4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Query
 
 @Dao
 interface ImageDAO {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index d14b03404..197799033 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.*
+import androidx.lifecycle.LiveData
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index 9a80d55c9..8c4694c1e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.Signature
 
 @Dao
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 0eb36b060..4504444d2 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index b96727edd..a7eb4f8bc 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.*
+import androidx.lifecycle.LiveData
+import androidx.room.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
index 97730b711..31ae92b4a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration10 : Migration(9, 10) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
index 3855b9788..25c100535 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration11 : Migration(10, 11) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
index 3366a3382..6d7421755 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration12 : Migration(11, 12) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
index ed4d7138b..d87dd20a1 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration13 : Migration(12, 13) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
index 6b0aa84f5..93cb6b483 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration14 : Migration(13, 14) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
index 106a829c5..0e665f32c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration15 : Migration(14, 15) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
index 82862d149..8318bd1da 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration16 : Migration(15, 16) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
index 3059a63ea..128b80a09 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration17 : Migration(16, 17) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
index 52248a672..fea12287b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration18 : Migration(17, 18) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
index a16488b1a..dc8f617e8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration19 : Migration(18, 19) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
index 08f72d8fc..9a2afc026 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration2 : Migration(1, 2) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
index d8396dd51..68ad513a9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration20 : Migration(19, 20) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
index e7914d7d6..832a9d66b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration21 : Migration(20, 21) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
index 3564f185f..01cfb9727 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration22 : Migration(21, 22) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
index 536622d47..c0080e15a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.utils.moveTo
 import java.io.File
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
index 07bafaf91..23994048e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration24 : Migration(23, 24) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
index ea41c8a00..f080383dd 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration25 : Migration(24, 25) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index d417e4046..96869f7ac 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 import android.database.Cursor
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
index a9fa7fdb9..2fd0c0009 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration3 : Migration(2, 3) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
index 4a0b2a9fc..c6e9ad670 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration4 : Migration(3, 4) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
index 206ec5bb9..300b61eae 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration5 : Migration(4, 5) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
index 21217a19e..4f7b469ed 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import java.io.File
 import java.io.IOException
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
index d67b500eb..5f8cb9a68 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration7 : Migration(6, 7) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
index bec0bcca8..4a8f905e9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 
 object Migration8 : Migration(7, 8) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 081e9e921..b58061613 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 import android.content.ContentValues
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase.*
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index c2c8b298d..5eadeb0bf 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.RoomDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.RoomDatabase
 import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
index b4432c12c..37e22149a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import de.dreier.mytargets.shared.utils.toByteArray
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
index e7ca73eea..304741771 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import de.dreier.mytargets.shared.models.Dimension
 
 class DimensionConverters {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
index 48ba9cf47..9f2e272b0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import de.dreier.mytargets.shared.models.EBowType
 
 class EBowTypeConverters {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
index 2f090f5a7..94f3976bb 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import de.dreier.mytargets.shared.models.EWeather
 
 class EWeatherConverters {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
index 199b65922..ea0d4533d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
index b196ad572..68b3dac9e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import org.threeten.bp.LocalTime
 import org.threeten.bp.format.DateTimeFormatter
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
index e139719f3..ca373422e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.db.typeconverters
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import de.dreier.mytargets.shared.models.Thumbnail
 
 class ThumbnailConverters {
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index c1d72e9b0..01dd6e671 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -18,17 +18,17 @@ package de.dreier.mytargets.base.fragments
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.annotation.CallSuper
-import android.support.design.widget.AppBarLayout
-import android.support.design.widget.CoordinatorLayout
-import android.support.v7.widget.PopupMenu
+import androidx.annotation.CallSuper
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.appcompat.widget.PopupMenu
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import com.evernote.android.state.State
+import com.google.android.material.appbar.AppBarLayout
 import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentEditImageBinding
@@ -145,7 +145,7 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
 
     @NeedsPermission(Manifest.permission.CAMERA)
     internal fun onTakePicture() {
-        EasyImage.openCamera(this, 0)
+        EasyImage.openCameraForImage(this, 0)
     }
 
     @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
@@ -180,7 +180,7 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
 
                 override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
                     //Cancel handling, you might wanna remove taken photo if it was canceled
-                    if (source == EasyImage.ImageSource.CAMERA) {
+                    if (source == EasyImage.ImageSource.CAMERA_IMAGE) {
                         val photoFile = EasyImage.lastlyTakenButCanceledPhoto(context!!)
                         photoFile?.delete()
                     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index d931b76c4..e80598c04 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -15,8 +15,8 @@
 package de.dreier.mytargets.base.fragments
 
 import android.os.Bundle
-import android.support.annotation.PluralsRes
-import android.support.design.widget.Snackbar
+import androidx.annotation.PluralsRes
+import com.google.android.material.snackbar.Snackbar
 import android.view.View
 import com.google.firebase.analytics.FirebaseAnalytics
 import de.dreier.mytargets.R
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 5411c49a4..cf2a95545 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -17,12 +17,12 @@ package de.dreier.mytargets.base.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.support.annotation.UiThread
-import android.support.annotation.WorkerThread
-import android.support.v4.app.Fragment
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.annotation.UiThread
+import androidx.annotation.WorkerThread
+import androidx.fragment.app.Fragment
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.AsyncTaskLoader
+import androidx.loader.content.Loader
 import de.dreier.mytargets.base.navigation.NavigationController
 
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
index d15aa5443..7f8b9107d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.base.fragments
 
-import android.support.annotation.PluralsRes
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.view.ActionMode
+import androidx.annotation.PluralsRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
 import de.dreier.mytargets.R
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index 7ba86e9b9..3c10d256f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -17,8 +17,8 @@ package de.dreier.mytargets.base.fragments
 
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.evernote.android.state.State
 import de.dreier.mytargets.base.adapters.ListAdapterBase
 import de.dreier.mytargets.shared.models.IIdProvider
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index f0b2ff220..6d09c28bd 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.fragments
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Parcelable
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
index cbc237adb..86c267a7b 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.base.gallery
 
 import android.content.Context
-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager
 import android.util.AttributeSet
 import android.view.MotionEvent
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 8aefe81cb..b30932724 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -18,13 +18,13 @@ package de.dreier.mytargets.base.gallery
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v4.view.ViewPager
-import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.viewpager.widget.ViewPager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
@@ -173,7 +173,7 @@ class GalleryActivity : ChildActivityBase() {
 
     @NeedsPermission(Manifest.permission.CAMERA)
     internal fun onTakePicture() {
-        EasyImage.openCamera(this, 0)
+        EasyImage.openCameraForImage(this, 0)
     }
 
     @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
@@ -206,7 +206,7 @@ class GalleryActivity : ChildActivityBase() {
 
                 override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
                     //Cancel handling, you might wanna remove taken photo if it was canceled
-                    if (source == EasyImage.ImageSource.CAMERA) {
+                    if (source == EasyImage.ImageSource.CAMERA_IMAGE) {
                         val photoFile = EasyImage
                             .lastlyTakenButCanceledPhoto(applicationContext)
                         photoFile?.delete()
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
index 7a2ed033f..890245e8e 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.base.gallery
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
index 98972be2b..ca747e234 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.base.gallery.adapters
 import android.app.Activity
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
index 23c06e950..1c82d45bb 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
@@ -16,9 +16,9 @@
 package de.dreier.mytargets.base.gallery.adapters
 
 import android.app.Activity
-import android.support.v4.view.PagerAdapter
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import androidx.viewpager.widget.PagerAdapter
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.Toolbar
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index c450fb54c..80153a0e7 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -18,10 +18,10 @@ package de.dreier.mytargets.base.navigation
 import android.app.Activity
 import android.content.Intent
 import android.os.Parcelable
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.preference.PreferenceFragmentCompat
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.gallery.GalleryActivity
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
index c0a37909e..c567280f8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -16,8 +16,8 @@
 package de.dreier.mytargets.base.viewmodel
 
 import android.app.Application
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import de.dreier.mytargets.features.arrows.ArrowListViewModel
 import de.dreier.mytargets.features.arrows.EditArrowViewModel
 import de.dreier.mytargets.features.distance.DistancesViewModel
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
index f7711a1dc..22fb6966c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.arrows
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class ArrowListActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index e25ce913d..3c59f11ee 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.arrows
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
index cf854b9b3..5654ffe5b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.arrows
 
 import android.app.Application
-import android.arch.lifecycle.AndroidViewModel
+import androidx.lifecycle.AndroidViewModel
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.db.Arrow
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
index 69af2ab29..f5e0949ff 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.arrows
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index ee1b72ed5..a9b55315b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.arrows
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index e9a8b1509..8374d5a2c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.features.arrows
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.annotation.CallSuper
+import androidx.annotation.CallSuper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 086496224..44c341d76 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -16,14 +16,14 @@
 package de.dreier.mytargets.features.arrows
 
 import android.app.Application
-import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Transformations
-import android.databinding.ObservableBoolean
-import android.databinding.ObservableField
-import android.databinding.ObservableFloat
-import android.databinding.ObservableInt
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableField
+import androidx.databinding.ObservableFloat
+import androidx.databinding.ObservableInt
 import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
@@ -116,7 +116,7 @@ class EditArrowViewModel(app: Application) : AndroidViewModel(app) {
 
     private fun validateInput(): Boolean {
         if (diameterUnit.get() == MILLIMETER) {
-            if (diameterValue.get() !in 1..20) {
+            if (diameterValue.get() !in 1f..20f) {
                 diameterErrorText.set(getApplication<ApplicationInstance>().getString(R.string.not_within_expected_range_mm))
                 return false
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
index dc94c8019..6c407af00 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.bows
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class BowListActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
index a73931fec..27f0c63ae 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.bows
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index b5825bcae..ba7502800 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.bows
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index 4f09bac04..47505d5c1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.features.bows
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.annotation.CallSuper
+import androidx.annotation.CallSuper
 import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
index 930f79658..49fad5407 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.distance
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class DistanceActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
index 1500fdeb2..6e93b3b23 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.features.distance
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 772d65145..6e1e9b600 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -15,14 +15,14 @@
 
 package de.dreier.mytargets.features.distance
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v7.widget.GridLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
@@ -74,7 +74,7 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         val factory = ViewModelFactory(activity!!.application!!)
         viewModel = ViewModelProviders.of(this, factory).get(DistancesViewModel::class.java)
         val bundle = arguments!!
-        val distance: Dimension = bundle.getParcelable(ITEM)
+        val distance: Dimension = bundle.getParcelable(ITEM)!!
         unit = Unit.from(bundle.getString(DISTANCE_UNIT))!!
         viewModel.setUnit(unit)
         viewModel.setDistance(distance)
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
index f32db53bc..de9a11bb8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.distance
 
 import android.app.AlertDialog
 import android.content.Context
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.text.InputType
 import android.view.LayoutInflater
 import de.dreier.mytargets.R
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
index b44555347..a8e2c3a3e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
@@ -17,9 +17,8 @@ package de.dreier.mytargets.features.distance
 
 import android.content.Context
 import android.graphics.Rect
-import android.support.v7.widget.RecyclerView
 import android.view.View
-
+import androidx.recyclerview.widget.RecyclerView
 import de.dreier.mytargets.R
 
 
@@ -34,7 +33,7 @@ class DistanceItemDecorator(context: Context, private val gridSize: Int) :
         outRect: Rect,
         view: View,
         parent: RecyclerView,
-        state: RecyclerView.State?
+        state: RecyclerView.State
     ) {
         val position = parent.getChildAdapterPosition(view)
         if (position % gridSize == 0) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
index 7b6c10010..adc527a8d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.features.distance
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentPagerAdapter
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.*
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt
index f2086a18a..57a140cd0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.features.distance
 
 import android.app.Application
-import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Transformations
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.Dimension
 
@@ -39,7 +39,7 @@ class DistancesViewModel(app: Application) : AndroidViewModel(app) {
             val distances = mutableSetOf(de.dreier.mytargets.shared.models.Dimension.UNKNOWN)
 
             // Add currently selected distance to list
-            if (this.distance.value?.unit == unit) {
+            if (this.distance.value?.unit == unit.value) {
                 distances.add(this.distance.value!!)
             }
             distances.addAll(filteredDistances)
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt b/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
index 5d00854aa..eb23de19b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.help
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
index 5ffa08602..0c0523863 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.features.help
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.annotation.CallSuper
-import android.support.v4.app.Fragment
+import androidx.annotation.CallSuper
+import androidx.fragment.app.Fragment
 import android.view.*
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
index a62dd47d6..f5dc69ca6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.help.licences
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
index 5acc39230..40046bdb6 100755
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
@@ -17,8 +17,8 @@ package de.dreier.mytargets.features.help.licences
 
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.v4.app.Fragment
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
index db0226a07..f7330296f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.main
 
-import agency.tango.materialintroscreen.MaterialIntroActivity
-import agency.tango.materialintroscreen.SlideFragmentBuilder
+import io.github.dreierf.materialintroscreen.MaterialIntroActivity
+import io.github.dreierf.materialintroscreen.SlideFragmentBuilder
 import android.os.Bundle
 import de.dreier.mytargets.R
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
index dd2cf1f10..a37f88ecb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
@@ -17,17 +17,17 @@ package de.dreier.mytargets.features.main
 
 import android.content.Intent
 import android.content.res.Configuration
-import android.databinding.DataBindingUtil
 import android.graphics.Color
 import android.os.Bundle
-import android.support.test.espresso.idling.CountingIdlingResource
-import android.support.v4.view.GravityCompat
-import android.support.v7.app.ActionBarDrawerToggle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.app.AppCompatDelegate
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.GravityCompat
+import androidx.databinding.DataBindingUtil
+import androidx.test.espresso.idling.CountingIdlingResource
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.databinding.ActivityMainBinding
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 762339fcb..d7f624848 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -15,7 +15,7 @@
 package de.dreier.mytargets.features.rounds
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
index b4d9520f7..c03535381 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.scoreboard
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 import de.dreier.mytargets.utils.ToolbarUtils
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 14f8e576d..fddad757d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -24,18 +24,18 @@ import android.os.Build
 import android.os.Bundle
 import android.print.PrintAttributes
 import android.print.PrintManager
-import android.support.annotation.RequiresApi
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.LocalBroadcastManager
 import android.view.*
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
-import androidx.core.content.systemService
+import androidx.annotation.RequiresApi
+import androidx.core.content.getSystemService
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.google.android.material.snackbar.Snackbar
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.RoundRepository
@@ -180,8 +180,8 @@ class ScoreboardFragment : FragmentBase() {
             signatureDialogFragment.show(fm, "signature")
             fm.registerFragmentLifecycleCallbacks(object :
                 FragmentManager.FragmentLifecycleCallbacks() {
-                override fun onFragmentViewDestroyed(fm: FragmentManager?, f: Fragment?) {
-                    fm!!.unregisterFragmentLifecycleCallbacks(this)
+                override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                    fm.unregisterFragmentLifecycleCallbacks(this)
                     reloadData()
                 }
             }, false)
@@ -284,7 +284,7 @@ class ScoreboardFragment : FragmentBase() {
         val pda = CustomPrintDocumentAdapter(ViewToPdfWriter(content), fileName)
 
         // Create a print job with name and adapter instance
-        val printManager = context.systemService<PrintManager>()
+        val printManager = context.getSystemService<PrintManager>()!!
         printManager.print(jobName, pda, PrintAttributes.Builder().build())
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index 77aa8e105..fccb651a1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -22,7 +22,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.os.Build
 import android.print.PageRange
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import de.dreier.mytargets.base.db.AppDatabase
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index dfaf98564..7c445f18f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.scoreboard
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
 import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
index 730a85dbb..200118f9a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.scoreboard.layout
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.features.scoreboard.builder.model.Table
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
index b850e79fd..a782b95b0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.settings
 
 import android.content.Context
 import android.content.res.TypedArray
-import android.support.v7.preference.DialogPreference
+import androidx.preference.DialogPreference
 import android.util.AttributeSet
 
 import org.threeten.bp.LocalDate
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
index 312fb6d01..fe51e4fb6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
@@ -18,10 +18,10 @@ package de.dreier.mytargets.features.settings
 import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.preference.DialogPreference
-import android.support.v7.preference.Preference
-import android.support.v7.preference.PreferenceDialogFragmentCompat
+import androidx.fragment.app.DialogFragment
+import androidx.preference.DialogPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceDialogFragmentCompat
 import android.widget.DatePicker
 
 import org.threeten.bp.LocalDate
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
index 29b1539f5..5d85567c9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.settings
 
 import android.content.Context
-import android.support.v7.preference.ListPreference
+import androidx.preference.ListPreference
 import android.util.AttributeSet
 import im.delight.android.languages.LanguageList
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
index 91b5b7ed6..071a291f9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.settings
 
-import android.support.v7.preference.Preference
+import androidx.preference.Preference
 
 class ProfileSettingsFragment : SettingsFragmentBase() {
 
@@ -42,6 +42,6 @@ class ProfileSettingsFragment : SettingsFragmentBase() {
 
     companion object {
         private const val DIALOG_FRAGMENT_TAG =
-            "android.support.v7.preference.PreferenceFragment.DIALOG"
+            "androidx.preference.PreferenceFragment.DIALOG"
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
index dd7ab4b90..d3752e206 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
@@ -15,14 +15,21 @@
 
 package de.dreier.mytargets.features.settings
 
+import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.preference.PreferenceFragmentCompat
-import android.support.v7.preference.PreferenceFragmentCompat.ARG_PREFERENCE_ROOT
-import android.support.v7.preference.PreferenceScreen
 import android.view.MenuItem
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.transaction
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceFragmentCompat.ARG_PREFERENCE_ROOT
+import androidx.preference.PreferenceScreen
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.common.api.ApiException
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 import de.dreier.mytargets.features.settings.ESettingsScreens.MAIN
+import de.dreier.mytargets.features.settings.backup.provider.GoogleDriveBackup.AsyncRestore.Companion.REQUEST_CODE_SIGN_IN
+import timber.log.Timber
 
 class SettingsActivity : SimpleFragmentActivityBase(),
     PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
@@ -50,15 +57,15 @@ class SettingsActivity : SimpleFragmentActivityBase(),
         preferenceFragmentCompat: PreferenceFragmentCompat,
         preferenceScreen: PreferenceScreen
     ): Boolean {
-        val ft = supportFragmentManager.beginTransaction()
         val screen = ESettingsScreens.from(preferenceScreen.key)
         val fragment = screen.create()
         val args = Bundle()
         args.putString(ARG_PREFERENCE_ROOT, preferenceScreen.key)
         fragment.arguments = args
-        ft.add(android.R.id.content, fragment, preferenceScreen.key)
-        ft.addToBackStack(preferenceScreen.key)
-        ft.commit()
+        supportFragmentManager.transaction {
+            add(android.R.id.content, fragment, preferenceScreen.key)
+            addToBackStack(preferenceScreen.key)
+        }
         return true
     }
 
@@ -77,7 +84,7 @@ class SettingsActivity : SimpleFragmentActivityBase(),
                     ft.replace(
                         android.R.id.content,
                         instantiateFragment(),
-                        SimpleFragmentActivityBase.Companion.FRAGMENT_TAG
+                        SimpleFragmentActivityBase.FRAGMENT_TAG
                     )
                     ft.commit()
                 }
@@ -86,4 +93,34 @@ class SettingsActivity : SimpleFragmentActivityBase(),
             else -> super.onOptionsItemSelected(item)
         }
     }
+
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        Timber.d("A.onActivityResult")
+
+        // Result returned from launching the Intent from GoogleSignInClient.getSignInIntent(...);
+//        if (requestCode == REQUEST_CODE_SIGN_IN) {
+//            // The Task returned from this call is always completed, no need to attach
+//            // a listener.
+//            Timber.d("A.REQUEST_CODE_SIGN_IN")
+//            try {
+//                val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+//                    .getResult(ApiException::class.java)
+//                task?.let { handleSignInResult(it) }
+//            } catch (e: ApiException) {
+//                // The ApiException status code indicates the detailed failure reason.
+//                // Please refer to the GoogleSignInStatusCodes class reference for more information.
+//                Timber.w("signInResult:failed code=%s", e.statusCode)
+//                Timber.w(e)
+////            updateUI(null)
+//            }
+//        }
+    }
+
+    private fun handleSignInResult(account: GoogleSignInAccount) {
+        Timber.d("signed in")
+        // Signed in successfully, show authenticated UI.
+//            updateUI(account)
+    }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
index f46240c09..68d9e22c7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
@@ -18,9 +18,9 @@ package de.dreier.mytargets.features.settings
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceFragmentCompat
+import androidx.core.content.ContextCompat
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceFragmentCompat
 import android.view.View
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index 9f0d69819..0b61ba7ee 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.settings
 
-import android.support.v4.util.LongSparseArray
+import androidx.collection.LongSparseArray
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.scoreboard.EFileType
 import de.dreier.mytargets.features.scoreboard.ScoreboardConfiguration
@@ -66,6 +66,7 @@ object SettingsManager {
     private const val KEY_INPUT_SUMMARY_SHOW_AVERAGE = "input_summary_show_average"
     const val KEY_SCOREBOARD_SHARE_FILE_TYPE = "scoreboard_share_file_type"
     private const val KEY_BACKUP_INTERVAL = "backup_interval"
+    private const val KEY_GOOGLE_BACKUP_PATH = "backup_path"
     private const val KEY_DONATED = "donated"
     private const val KEY_TIMER_KEEP_ABOVE_LOCKSCREEN = "timer_keep_above_lockscreen"
     private const val KEY_TIMER_VIBRATE = "timer_vibrate"
@@ -158,7 +159,7 @@ object SettingsManager {
     var timerSettings: TimerSettings
         get() {
             fun getPrefTime(key: String, def: Int): Int {
-                return preferences.getString(key, def.toString()).toIntOrNull() ?: def
+                return preferences.getString(key, def.toString())?.toIntOrNull() ?: def
             }
 
             val settings = TimerSettings()
@@ -201,14 +202,14 @@ object SettingsManager {
     var showMode: ETrainingScope
         get() = ETrainingScope.valueOf(
             preferences
-                .getString(KEY_SHOW_MODE, ETrainingScope.END.toString())
+                .getString(KEY_SHOW_MODE, ETrainingScope.END.toString())!!
         )
         set(value) = preferences.set(KEY_SHOW_MODE, value.toString())
 
     var aggregationStrategy: EAggregationStrategy
         get() = EAggregationStrategy.valueOf(
             preferences
-                .getString(KEY_AGGREGATION_STRATEGY, EAggregationStrategy.AVERAGE.toString())
+                .getString(KEY_AGGREGATION_STRATEGY, EAggregationStrategy.AVERAGE.toString())!!
         )
         set(value) = preferences.set(KEY_AGGREGATION_STRATEGY, value.toString())
 
@@ -221,7 +222,7 @@ object SettingsManager {
         set(value) = preferences.set(KEY_PROFILE_LAST_NAME, value)
 
     val profileFullName: String
-        get() = "%s %s".format(profileFirstName, profileLastName).trim()
+        get() = "$profileFirstName $profileLastName".trim()
 
     var profileClub: String
         get() = preferences[KEY_PROFILE_CLUB, ""]
@@ -289,6 +290,10 @@ object SettingsManager {
         get() = EBackupInterval.valueOf(preferences[KEY_BACKUP_INTERVAL, EBackupInterval.WEEKLY.name])
         set(value) = preferences.set(KEY_BACKUP_INTERVAL, value.name)
 
+    var backupPathGoogleDrive: String
+        get() = preferences[KEY_GOOGLE_BACKUP_PATH, "root"]
+        set(value) = preferences.set(KEY_GOOGLE_BACKUP_PATH, value)
+
     var standardRoundsLastUsed: LongSparseArray<Int>
         get() {
             return lastUsed[KEY_STANDARD_ROUNDS_LAST_USED, ""]
@@ -310,7 +315,7 @@ object SettingsManager {
             config.showTraining = preferences[KEY_INPUT_SUMMARY_SHOW_TRAINING, false]
             config.showAverage = preferences[KEY_INPUT_SUMMARY_SHOW_AVERAGE, true]
             config.averageScope =
-                    ETrainingScope.valueOf(preferences[KEY_INPUT_SUMMARY_AVERAGE_OF, "ROUND"])
+                ETrainingScope.valueOf(preferences[KEY_INPUT_SUMMARY_AVERAGE_OF, "ROUND"])
             return config
         }
         set(value) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
index f6c8638b7..535373ae7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.wearable.WearableClientBase.Companion.BROADCAST_TIMER_SETTINGS_FROM_REMOTE
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
index c48d03b94..1f11d020b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.settings.about
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
index f8a3d8621..b2567aaa4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
@@ -17,12 +17,12 @@ package de.dreier.mytargets.features.settings.about
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.StringRes
 import androidx.core.net.toUri
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.R
 import mehdi.sakout.aboutpage.AboutPage
@@ -43,12 +43,12 @@ class AboutFragment : Fragment() {
         )
 
     private val betaTesterElement: Element
-        get() = WebElement(R.string.test_beta, R.drawable.about_icon_beta_test, URL_GOOGLE_PLUS)
+        get() = WebElement(R.string.test_beta, R.drawable.about_icon_beta_test, URL_PLAY_STORE)
 
-    private val googlePlusElement: Element
+    private val slackElement: Element
         get() = WebElement(
-            R.string.join_on_google_plus, R.drawable.about_icon_google_plus,
-            URL_GOOGLE_PLUS
+            R.string.join_on_slack, R.drawable.about_icon_slack,
+            URL_SLACK
         )
 
     private val payPalDonateElement: Element
@@ -69,7 +69,7 @@ class AboutFragment : Fragment() {
             sendIntent.putExtra(Intent.EXTRA_TEXT, URL_PLAY_STORE)
             sendIntent.type = "text/plain"
             shareElement.intent =
-                    Intent.createChooser(sendIntent, getString(R.string.share_with_friends))
+                Intent.createChooser(sendIntent, getString(R.string.share_with_friends))
             return shareElement
         }
 
@@ -98,7 +98,7 @@ class AboutFragment : Fragment() {
             .addGroup(getString(R.string.connect))
             .addEmail("dreier.florian@gmail.com")
             .addPlayStore("de.dreier.mytargets")
-            .addItem(googlePlusElement)
+            .addItem(slackElement)
             .addGitHub("DreierF")
             .addItem(linkedInItem)
             .addGroup(getString(R.string.special_thanks_to))
@@ -126,8 +126,8 @@ class AboutFragment : Fragment() {
     }
 
     companion object {
-        private const val URL_GOOGLE_PLUS =
-            "https://plus.google.com/u/0/communities/102686119334423317437"
+        private const val URL_SLACK =
+            "https://join.slack.com/t/mytargets/shared_invite/enQtNjk2NTE0MzU5NzE0LTc3NjAwYmZiNTcxMDA1NTI0M2UzYWY4ZGQwMjVhYjEyODQ0MDE2MjlhZjZiZTUwODg2YTE5YjhkN2FmZTQ2Njc"
         private const val URL_PLAY_STORE =
             "http://play.google.com/store/apps/details?id=de.dreier.mytargets"
         private const val URL_PAYPAL = "https://www.paypal.me/floriandreier"
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
index 69a727d93..ac0dec5be 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
@@ -17,10 +17,10 @@ package de.dreier.mytargets.features.settings.about
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.app.AppCompatDelegate
-import android.support.v7.widget.LinearLayoutManager
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.TransactionDetails
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
index cc61e4d6f..6a5aad017 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.settings.about
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
index 17e74ebeb..554851a46 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
@@ -16,12 +16,13 @@
 package de.dreier.mytargets.features.settings.backup
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.ItemDetailsSecondaryActionBinding
+import org.threeten.bp.ZoneOffset
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
@@ -46,7 +47,7 @@ class BackupAdapter(
 
     override fun onBindViewHolder(holder: BackupViewHolder, position: Int) {
         val p = backupEntries[position]
-        val modified = formatDateTime.format(p.modifiedDate)
+        val modified = formatDateTime.format(p.lastModifiedAt)
         holder.binding.name.text = modified
         holder.binding.details.text = p.humanReadableSize
         holder.binding.primaryAction
@@ -56,7 +57,7 @@ class BackupAdapter(
     }
 
     override fun getItemId(position: Int): Long {
-        return backupEntries[position].modifiedDate!!.time
+        return backupEntries[position].lastModifiedAt
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
index c3c99e49a..e25cabcaa 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
@@ -16,9 +16,15 @@
 package de.dreier.mytargets.features.settings.backup
 
 import de.dreier.mytargets.utils.Utils
-import java.util.*
+import org.threeten.bp.LocalDate
 
-data class BackupEntry(var fileId: String?, var modifiedDate: Date?, private var backupSize: Long) {
+data class BackupEntry(
+    var fileId: String,
+
+    /** Milliseconds since 1970 at UTC. */
+    var lastModifiedAt: Long,
+    private var backupSize: Long
+) {
     val humanReadableSize: String
         get() = Utils.humanReadableByteCount(backupSize, true)
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
index 710619cd1..812986826 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
@@ -17,34 +17,33 @@ package de.dreier.mytargets.features.settings.backup
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.app.Activity.RESULT_OK
 import android.content.ContentResolver
 import android.content.ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
 import android.content.ContentResolver.SYNC_OBSERVER_TYPE_PENDING
 import android.content.Context
 import android.content.Intent
 import android.content.SyncStatusObserver
-import android.databinding.DataBindingUtil
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
-import android.support.annotation.StringRes
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.DividerItemDecoration.VERTICAL
 import android.text.format.DateUtils
 import android.view.*
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.DividerItemDecoration.VERTICAL
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.FragmentBackupBinding
 import de.dreier.mytargets.features.settings.SettingsFragmentBase
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.settings.backup.provider.BackupUtils
 import de.dreier.mytargets.features.settings.backup.provider.EBackupLocation
-import de.dreier.mytargets.features.settings.backup.provider.GoogleDriveBackup.AsyncRestore.Companion.REQUEST_CODE_RESOLUTION
 import de.dreier.mytargets.features.settings.backup.provider.IAsyncBackupRestore
 import de.dreier.mytargets.features.settings.backup.synchronization.GenericAccountService
 import de.dreier.mytargets.features.settings.backup.synchronization.SyncUtils
@@ -154,6 +153,9 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
         if (item.itemId == R.id.action_import) {
             showFilePickerWithPermissionCheck()
             return true
+        } else if (item.itemId == R.id.action_fix_db) {
+            DatabaseFixer.fix(ApplicationInstance.db)
+            return true
         }
         return super.onOptionsItemSelected(item)
     }
@@ -172,7 +174,6 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     }
 
     override fun onPause() {
-        backup?.stop()
         updateLabelTimer?.cancel()
         if (syncObserverHandle != null) {
             ContentResolver.removeStatusChangeListener(syncObserverHandle)
@@ -182,9 +183,8 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_CODE_RESOLUTION && resultCode != RESULT_OK) {
-            leaveBackupSettings()
-        }
+        Timber.d("onActivityResult: ")
+        backup!!.onActivityResult(requestCode, resultCode, data)
         if (requestCode == IMPORT_FROM_URI && resultCode == AppCompatActivity.RESULT_OK && data != null) {
             importFromUri(data.data)
         }
@@ -232,9 +232,6 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
                 EBackupLocation.list.indexOf(item)
             ) { _, _, index, _ ->
                 val location = EBackupLocation.list[index]
-                if (backup != null) {
-                    backup!!.stop()
-                }
                 internalApplyBackupLocationWithPermissionCheck(location)
                 true
             }
@@ -272,16 +269,29 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
             }
         })
         binding.recentBackupsList.adapter = adapter
-        backup!!.connect(activity!!, object : IAsyncBackupRestore.ConnectionListener {
-            override fun onConnected() {
-                updateBackupLocation()
-                backup!!.getBackups(this@BackupSettingsFragment)
-            }
+        backup!!.connect(
+            context!!,
+            object : IAsyncBackupRestore.ConnectionListener {
+                override fun onLoginCancelled() {
+                    internalApplyBackupLocationWithPermissionCheck(EBackupLocation.INTERNAL_STORAGE)
+                }
 
-            override fun onConnectionSuspended() {
-                showError(R.string.loading_backups_failed, getString(R.string.connection_failed))
-            }
-        })
+                override fun onStartIntent(intent: Intent, code: Int) {
+                    startActivityForResult(intent, code)
+                }
+
+                override fun onConnected() {
+                    updateBackupLocation()
+                    backup!!.getBackups(this@BackupSettingsFragment)
+                }
+
+                override fun onConnectionSuspended() {
+                    showError(
+                        R.string.loading_backups_failed,
+                        getString(R.string.connection_failed)
+                    )
+                }
+            })
     }
 
     override fun setActivityTitle() {
@@ -295,7 +305,7 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
         binding.lastBackupLabel.visibility = if (list.isNotEmpty()) VISIBLE else GONE
         updateLabelTimer?.cancel()
         if (list.isNotEmpty()) {
-            val time = list[0].modifiedDate!!.time
+            val time = list[0].lastModifiedAt
             updateLabelTimer = Timer()
             val timerTask = object : TimerTask() {
                 override fun run() {
@@ -333,7 +343,7 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
             getString(R.string.restore_desc),
             getString(R.string.backup_details),
             SimpleDateFormat.getDateTimeInstance()
-                .format(item.modifiedDate),
+                .format(item.lastModifiedAt),
             item.humanReadableSize
         )
         MaterialDialog.Builder(context!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/DatabaseFixer.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/DatabaseFixer.kt
new file mode 100644
index 000000000..0c60fd278
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/DatabaseFixer.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.settings.backup
+
+import de.dreier.mytargets.base.db.AppDatabase
+import timber.log.Timber
+
+object DatabaseFixer {
+    fun fix(db: AppDatabase) {
+        val openHelper = db.openHelper
+        openHelper.setWriteAheadLoggingEnabled(false)
+        val database = openHelper.writableDatabase
+        Timber.d("db integrity: %b", database.isDatabaseIntegrityOk)
+
+        database.query("reindex", arrayOf())
+        database.query("vacuum", arrayOf())
+
+        val cursor = database.query("pragma integrity_check;", arrayOf())
+        cursor.moveToNext()
+        val string = cursor.getString(0)
+        Timber.w("pragma integrity_check => $string")
+        cursor.close()
+
+        val cursor2 = database.query("SELECT * FROM `Training`", arrayOf())
+        cursor2.moveToNext()
+        Timber.w("trainings => ${cursor2.count}")
+        cursor2.close()
+
+        openHelper.close()
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
index 842d6f36e..1e9334421 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.settings.backup
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
index c19fd6d3c..afdd02bf1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
@@ -38,7 +38,7 @@ object BackupUtils {
         val file = unzip(context, `in`)
 
         // Replace database file
-        file!!.copyTo(context.getDatabasePath(AppDatabase.DATABASE_IMPORT_FILE_NAME), overwrite = true)
+        file.copyTo(context.getDatabasePath(AppDatabase.DATABASE_IMPORT_FILE_NAME), overwrite = true)
     }
 
     @Throws(IOException::class)
@@ -69,7 +69,7 @@ object BackupUtils {
     }
 
     @Throws(IOException::class)
-    private fun unzip(context: Context, input: InputStream): File? {
+    private fun unzip(context: Context, input: InputStream): File {
         val tmpDb = File.createTempFile("import", ".db")
         var dbFiles = 0
         input.use { `in` ->
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/DriveServiceHelper.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/DriveServiceHelper.kt
new file mode 100644
index 000000000..a6f619687
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/DriveServiceHelper.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2019 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+package de.dreier.mytargets.features.settings.backup.provider
+
+import android.content.ContentResolver
+import android.content.Intent
+import android.net.Uri
+import android.provider.OpenableColumns
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.Tasks
+import com.google.api.services.drive.Drive
+import com.google.api.services.drive.model.File
+import com.google.api.services.drive.model.FileList
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStream
+import java.io.InputStreamReader
+import java.util.concurrent.Callable
+import java.util.concurrent.Executors
+
+/**
+ * A utility for performing read/write operations on Drive files via the REST API and opening a
+ * file picker UI via Storage Access Framework.
+ */
+class DriveServiceHelper(private val mDriveService: Drive) {
+    private val executor = Executors.newSingleThreadExecutor()
+
+    /**
+     * Creates a text file in the user's My Drive folder and returns its file ID.
+     */
+    fun createFile(): Task<String> {
+        return Tasks.call(executor, Callable<String> {
+            val metadata = File()
+                .setParents(listOf("root"))
+                .setMimeType("text/plain")
+                .setName("Untitled file")
+
+            val googleFile = mDriveService.files().create(metadata).execute()
+                ?: throw IOException("Null result when requesting file creation.")
+
+            googleFile.id
+        })
+    }
+
+    /**
+     * Opens the file identified by `fileId` and returns a [Pair] of its name and
+     * contents.
+     */
+    fun readFile(fileId: String, consume: (InputStream) -> Unit): Task<Unit> {
+        return Tasks.call(executor, Callable<Unit> {
+            val inputStream = mDriveService.files().get(fileId).executeMediaAsInputStream()
+            consume(inputStream)
+        })
+    }
+
+    /**
+     * Updates the file identified by `fileId` with the given `name` and `content`.
+     */
+    fun deleteFile(fileId: String): Task<Void> {
+        return Tasks.call(executor, Callable<Void> {
+            mDriveService.files().delete(fileId).execute()
+            null
+        })
+    }
+
+    /**
+     * Returns a [FileList] containing all the visible files in the user's My Drive.
+     *
+     *
+     * The returned list will only contain files visible to this app, i.e. those which were
+     * created by this app. To perform operations on files not created by the app, the project must
+     * request Drive Full Scope in the [Google
+ * Developer's Console](https://play.google.com/apps/publish) and be submitted to Google for verification.
+     */
+    fun queryFiles(): Task<FileList> {
+        return Tasks.call(
+            executor,
+            Callable<FileList> {
+                mDriveService.files().list()
+                    .setQ("mimeType = '${GoogleDriveBackup.MYTARGETS_MIME_TYPE}'")
+                    .setFields("files(id,name,modifiedTime,trashed,size)")
+                    .setSpaces("drive,appDataFolder").execute()
+            })
+    }
+
+    /**
+     * Returns an [Intent] for opening the Storage Access Framework file picker.
+     */
+    fun createFilePickerIntent(): Intent {
+        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
+        intent.addCategory(Intent.CATEGORY_OPENABLE)
+        intent.type = "text/plain"
+
+        return intent
+    }
+
+    /**
+     * Opens the file at the `uri` returned by a Storage Access Framework [Intent]
+     * created by [.createFilePickerIntent] using the given `contentResolver`.
+     */
+    fun openFileUsingStorageAccessFramework(
+        contentResolver: ContentResolver, uri: Uri
+    ): Task<Pair<String, String>> {
+        return Tasks.call(executor, Callable<Pair<String, String>> {
+            // Retrieve the document's display name from its metadata.
+            var name = ""
+            contentResolver.query(uri, null, null, null, null).use()
+            { cursor ->
+                if (cursor != null && cursor.moveToFirst()) {
+                    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+                    name = cursor.getString(nameIndex)
+                } else {
+                    throw IOException("Empty cursor returned for file.")
+                }
+            }
+
+            // Read the document's contents as a String.
+            var content = ""
+            contentResolver.openInputStream(uri)!!.use()
+            { `is` ->
+                BufferedReader(InputStreamReader(`is`)).use { reader ->
+                    val stringBuilder = StringBuilder()
+                    var line: String? = reader.readLine()
+                    while (line != null) {
+                        stringBuilder.append(line)
+                        line = reader.readLine()
+                    }
+                    content = stringBuilder.toString()
+                }
+            }
+
+            Pair(name, content)
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
index 256193fe8..c98d77282 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.settings.backup.provider
 
-import android.support.annotation.DrawableRes
-import android.support.annotation.StringRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.models.IIdProvider
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
index a95ab886f..6d7b259ae 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.settings.backup.provider
 
-import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.BackupEntry
@@ -27,7 +27,8 @@ import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
-import java.util.*
+import java.lang.ref.WeakReference
+
 
 object ExternalStorageBackup {
     private const val FOLDER_NAME = "MyTargets"
@@ -67,10 +68,10 @@ object ExternalStorageBackup {
     }
 
     class AsyncRestore : IAsyncBackupRestore {
-        private var activity: Activity? = null
+        private var context: WeakReference<Context>? = null
 
-        override fun connect(activity: Activity, listener: IAsyncBackupRestore.ConnectionListener) {
-            this.activity = activity
+        override fun connect(context: Context, listener: IAsyncBackupRestore.ConnectionListener) {
+            this.context = WeakReference(context)
             listener.onConnected()
         }
 
@@ -82,11 +83,11 @@ object ExternalStorageBackup {
                     .map {
                         BackupEntry(
                             it.absolutePath,
-                            Date(it.lastModified()),
+                            it.lastModified(),
                             it.length()
                         )
                     }
-                    .sortedByDescending { it.modifiedDate }
+                    .sortedByDescending { it.lastModifiedAt }
                 listener.onLoadFinished(backups)
             }
         }
@@ -101,7 +102,7 @@ object ExternalStorageBackup {
         ) {
             val file = File(backup.fileId)
             try {
-                BackupUtils.importZip(activity!!, FileInputStream(file))
+                BackupUtils.importZip(context!!.get()!!, FileInputStream(file))
                 listener.onFinished()
             } catch (e: IOException) {
                 listener.onError(e.localizedMessage)
@@ -121,8 +122,8 @@ object ExternalStorageBackup {
             }
         }
 
-        override fun stop() {
-            activity = null
+        override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+            return false
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
index a68250606..322954af1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
@@ -17,97 +17,111 @@ package de.dreier.mytargets.features.settings.backup.provider
 
 import android.app.Activity
 import android.content.Context
-import android.content.IntentSender
-import android.os.Bundle
-import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.common.api.GoogleApiClient
-import com.google.android.gms.common.api.ResultCallback
-import com.google.android.gms.drive.*
-import com.google.android.gms.drive.query.*
+import android.content.Intent
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.Scope
+import com.google.api.client.extensions.android.http.AndroidHttp
+import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
+import com.google.api.client.http.FileContent
+import com.google.api.client.json.gson.GsonFactory
+import com.google.api.services.drive.Drive
+import com.google.api.services.drive.DriveScopes
+import com.google.api.services.drive.model.File
 import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 import de.dreier.mytargets.features.settings.backup.BackupException
 import timber.log.Timber
+import java.io.FileOutputStream
 import java.io.IOException
+import java.lang.ref.WeakReference
 import java.util.*
+import kotlin.collections.ArrayList
+
 
 object GoogleDriveBackup {
 
-    private const val MYTARGETS_MIME_TYPE = "application/zip"
+    const val MYTARGETS_MIME_TYPE = "application/zip"
 
     class AsyncRestore : IAsyncBackupRestore {
 
-        private var googleApiClient: GoogleApiClient? = null
-        private var activity: Activity? = null
-
-        override fun connect(activity: Activity, listener: IAsyncBackupRestore.ConnectionListener) {
-            this.activity = activity
-            if (googleApiClient == null) {
-                googleApiClient = GoogleApiClient.Builder(activity)
-                    .addApi(Drive.API)
-                    .addScope(Drive.SCOPE_APPFOLDER)
-                    .addConnectionCallbacks(object : GoogleApiClient.ConnectionCallbacks {
-                        override fun onConnected(bundle: Bundle?) {
-                            Drive.DriveApi.requestSync(googleApiClient)
-                                .setResultCallback { listener.onConnected() }
-                        }
+        private var context: WeakReference<Context>? = null
 
-                        override fun onConnectionSuspended(cause: Int) {
-                            listener.onConnectionSuspended()
-                        }
-                    })
-                    .addOnConnectionFailedListener { result ->
-                        Timber.i("GoogleApiClient connection failed: %s", result.toString())
-                        if (!result.hasResolution()) {
-                            GoogleApiAvailability.getInstance()
-                                .getErrorDialog(activity, result.errorCode, 0)
-                                .show()
-                            listener.onConnectionSuspended()
-                            return@addOnConnectionFailedListener
-                        }
-                        try {
-                            result.startResolutionForResult(activity, REQUEST_CODE_RESOLUTION)
-                        } catch (e: IntentSender.SendIntentException) {
-                            Timber.e(e, "Exception while starting resolution activity")
-                        }
-                    }
+        private var listener: IAsyncBackupRestore.ConnectionListener? = null
+
+        private var driveServiceHelper: DriveServiceHelper? = null
+
+        override fun connect(
+            context: Context,
+            listener: IAsyncBackupRestore.ConnectionListener
+        ) {
+            Timber.d("connect: ")
+            this.context = WeakReference(context)
+            this.listener = listener
+
+            val account = GoogleSignIn.getLastSignedInAccount(context)
+            Timber.d("scopes: %s", account?.grantedScopes)
+            if (account != null && GoogleSignIn.hasPermissions(
+                    account,
+                    Scope(DriveScopes.DRIVE_FILE),
+                    Scope(DriveScopes.DRIVE_APPDATA)
+                )
+            ) {
+                Timber.d("On connected")
+                initServiceHelper(account)
+                listener.onConnected()
+            } else {
+                Timber.d("Requesting sign-in")
+                val signInOptions = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                    .requestEmail()
+                    .requestScopes(Scope(DriveScopes.DRIVE_FILE), Scope(DriveScopes.DRIVE_APPDATA))
                     .build()
+                val client = GoogleSignIn.getClient(context, signInOptions)
+
+                // The result of the sign-in Intent is handled in onActivityResult.
+                listener.onStartIntent(client.signInIntent, REQUEST_CODE_SIGN_IN)
             }
-            googleApiClient!!.connect()
         }
 
         override fun getBackups(listener: IAsyncBackupRestore.OnLoadFinishedListener) {
-            val query = Query.Builder()
-                .addFilter(Filters.eq(SearchableField.MIME_TYPE, MYTARGETS_MIME_TYPE))
-                .addFilter(Filters.eq(SearchableField.TRASHED, false))
-                .setSortOrder(
-                    SortOrder.Builder()
-                        .addSortDescending(SortableField.MODIFIED_DATE).build()
-                )
-                .build()
-            Drive.DriveApi.getAppFolder(googleApiClient)!!.queryChildren(googleApiClient, query)
-                .setResultCallback(object : ResultCallback<DriveApi.MetadataBufferResult> {
-
-                    private val backupsArray = ArrayList<BackupEntry>()
-
-                    override fun onResult(result: DriveApi.MetadataBufferResult) {
-                        val buffer = result.metadataBuffer
-                        val size = buffer.count
-                        for (i in 0 until size) {
-                            val metadata = buffer.get(i)
-                            val driveId = metadata.driveId
-                            val backupSize = metadata.fileSize
+            Timber.d("getBackups: ")
+            driveServiceHelper?.let { mDriveServiceHelper ->
+                Timber.d("Querying for files.")
+
+                mDriveServiceHelper.queryFiles()
+                    .addOnSuccessListener { fileList ->
+                        Timber.d("getBackups: children")
+                        val backupsArray = ArrayList<BackupEntry>()
+                        for (file in fileList.files) {
+
+                            if (file.trashed == true
+                                || file.name?.endsWith(".zip") != true
+                            ) {
+                                continue
+                            }
                             backupsArray.add(
                                 BackupEntry(
-                                    driveId.encodeToString(),
-                                    metadata.modifiedDate, backupSize
+                                    file.id,
+                                    file.modifiedTime.value,
+                                    // Do not replace with .size!! as that returns
+                                    // the number of entries in the HashMap (=4)
+                                    file.getSize()
                                 )
                             )
                         }
+                        backupsArray.sortByDescending { it.lastModifiedAt }
+
                         listener.onLoadFinished(backupsArray)
-                        buffer.release()
                     }
-                })
+                    .addOnFailureListener { exception ->
+                        Timber.e(
+                            exception,
+                            "Unable to query files."
+                        )
+                    }
+            }
         }
 
         /**
@@ -117,48 +131,94 @@ object GoogleDriveBackup {
             backup: BackupEntry,
             listener: IAsyncBackupRestore.BackupStatusListener
         ) {
-            DriveId.decodeFromString(backup.fileId!!)
-                .asDriveFile()
-                .open(googleApiClient, DriveFile.MODE_READ_ONLY, null)
-                .setResultCallback { result ->
-                    if (!result.status.isSuccess) {
-                        listener.onError(result.status.statusMessage!!)
-                        return@setResultCallback
-                    }
-
-                    // DriveContents object contains pointers to the actual byte stream
-                    val contents = result.driveContents
-                    val input = contents.inputStream
-                    try {
-                        BackupUtils.importZip(activity!!, input)
-                        listener.onFinished()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                        listener.onError(e.localizedMessage)
-                    }
-                }
+            driveServiceHelper?.readFile(backup.fileId) {
+                BackupUtils.importZip(context!!.get()!!, it)
+            }?.addOnSuccessListener {
+                listener.onFinished()
+            }?.addOnFailureListener { e -> listener.onError(e.localizedMessage) }
         }
 
         override fun deleteBackup(
             backup: BackupEntry,
             listener: IAsyncBackupRestore.BackupStatusListener
         ) {
-            DriveId.decodeFromString(backup.fileId!!)
-                .asDriveFile()
-                .delete(googleApiClient)
-                .setResultCallback { result ->
-                    if (result.status.isSuccess) {
-                        listener.onFinished()
-                    } else {
-                        listener.onError(result.status.statusMessage!!)
-                    }
+            driveServiceHelper?.deleteFile(backup.fileId)
+                ?.addOnSuccessListener { aVoid -> listener.onFinished() }
+                ?.addOnFailureListener { e -> listener.onError(e.localizedMessage) }
+        }
+
+        override fun onActivityResult(
+            requestCode: Int,
+            resultCode: Int,
+            resultData: Intent?
+        ): Boolean {
+            Timber.d("onActivityResult: %d", resultCode)
+
+            when (requestCode) {
+                REQUEST_CODE_SIGN_IN -> if (resultCode == Activity.RESULT_OK && resultData != null) {
+                    handleSignInResult(resultData)
+                } else if(resultCode == Activity.RESULT_CANCELED) {
+                    listener?.onLoginCancelled()
                 }
+
+                //TODO allow backup location choice
+//                REQUEST_CODE_OPEN_DOCUMENT -> if (resultCode == Activity.RESULT_OK && resultData != null) {
+//                    val uri = resultData.getData()
+//                    if (uri != null) {
+//                        openFileFromFilePicker(uri)
+//                    }
+//                }
+            }
+
+
+
+            return false
         }
 
-        override fun stop() {
-            googleApiClient?.disconnect()
-            googleApiClient = null
-            activity = null
+//        private fun openFileFromFilePicker(uri: Uri) {
+//            driveServiceHelper?.let {driveServiceHelper->
+//                Timber.d( "Opening %s",  uri.getPath())
+//
+//                driveServiceHelper.openFileUsingStorageAccessFramework(getContentResolver(), uri)
+//                    .addOnSuccessListener { (name, content) ->
+//
+//                        mFileTitleEditText.setText(name)
+//                        mDocContentEditText.setText(content)
+//
+//                    }
+//                    .addOnFailureListener { exception ->
+//                        Timber.e(
+//                            exception,
+//                            "Unable to open file from picker."
+//                        )
+//                    }
+//            }
+//        }
+
+        /**
+         * Handles the `result` of a completed sign-in activity initiated from [ ][.requestSignIn].
+         */
+        private fun handleSignInResult(result: Intent) {
+            GoogleSignIn.getSignedInAccountFromIntent(result)
+                .addOnSuccessListener { googleAccount ->
+                    Timber.d("Signed in as %s", googleAccount.email!!)
+
+                    initServiceHelper(googleAccount) //TODO check if redundant to connect
+                    listener!!.onConnected()
+                }
+                .addOnFailureListener { exception ->
+                    Timber.e(exception, "Unable to sign in.")
+                    listener!!.onConnectionSuspended()
+                }
+        }
+
+        private fun initServiceHelper(googleAccount: GoogleSignInAccount) {
+            val context = context!!.get()!!
+            val googleDriveService = buildDriveService(context, googleAccount)
+
+            // The DriveServiceHelper encapsulates all REST API and SAF functionality.
+            // Its instantiation is required before handling any onClick actions.
+            driveServiceHelper = DriveServiceHelper(googleDriveService)
         }
 
         companion object {
@@ -166,47 +226,62 @@ object GoogleDriveBackup {
             /**
              * Request code for auto Google Play Services error resolution.
              */
-            const val REQUEST_CODE_RESOLUTION = 1
+            const val REQUEST_CODE_SIGN_IN = 9001
         }
     }
 
+    private fun buildDriveService(
+        context: Context,
+        googleAccount: GoogleSignInAccount
+    ): Drive {
+        // Use the authenticated account to sign in to the Drive service.
+        val credential = GoogleAccountCredential.usingOAuth2(
+            context,
+            Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPDATA)
+        )
+        credential.selectedAccount = googleAccount.account
+        return Drive.Builder(
+            AndroidHttp.newCompatibleTransport(),
+            GsonFactory(),
+            credential
+        )
+            .setApplicationName("MyTargets")
+            .build()
+    }
+
     class Backup : IBlockingBackup {
         @Throws(BackupException::class)
         override fun performBackup(context: Context) {
-            val googleApiClient = GoogleApiClient.Builder(context)
-                .addApi(Drive.API)
-                .addScope(Drive.SCOPE_APPFOLDER)
-                .build()
-            val connectionResult = googleApiClient.blockingConnect()
-            if (!connectionResult.isSuccess) {
-                throw BackupException(connectionResult.errorMessage)
-            }
+            val account = GoogleSignIn.getLastSignedInAccount(context)
 
-            val result = Drive.DriveApi.newDriveContents(googleApiClient).await()
-            if (!result.status.isSuccess) {
-                throw BackupException(result.status.statusMessage)
+            if (account == null || !GoogleSignIn.hasPermissions(
+                    account,
+                    Scope(DriveScopes.DRIVE_FILE)
+                )
+            ) {
+                throw BackupException("Permission for file scope not granted!")
             }
+            val googleDriveService = buildDriveService(context, account)
 
-            val driveContents = result.driveContents
-            val outputStream = driveContents.outputStream
+            val metadata = File()
+                .setParents(listOf(SettingsManager.backupPathGoogleDrive))
+                .setMimeType(MYTARGETS_MIME_TYPE)
+                .setName(BackupUtils.backupName)
+
+            val tempFile = java.io.File.createTempFile(BackupUtils.backupName, ".zip")
 
             try {
-                BackupUtils.zip(context, ApplicationInstance.db, outputStream)
+                BackupUtils.zip(context, ApplicationInstance.db, FileOutputStream(tempFile))
+                val fileContent = FileContent(MYTARGETS_MIME_TYPE, tempFile)
+
+                googleDriveService.files().create(metadata, fileContent).execute()
+                    ?: throw BackupException("Null result when requesting file creation.")
             } catch (e: IOException) {
+                // The Task failed, this is the same exception you'd get in a non-blocking
+                // failure handler.
                 throw BackupException(e.localizedMessage, e)
-            }
-
-            val changeSet = MetadataChangeSet.Builder()
-                .setTitle(BackupUtils.backupName)
-                .setMimeType(MYTARGETS_MIME_TYPE)
-                .setStarred(true)
-                .build()
-
-            // create a file in selected folder
-            val result1 = Drive.DriveApi.getAppFolder(googleApiClient)!!
-                .createFile(googleApiClient, changeSet, driveContents).await()
-            if (!result1.status.isSuccess) {
-                throw BackupException(result1.status.statusMessage)
+            } finally {
+                tempFile.delete()
             }
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
index 5b7a6cd9e..885e54609 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
@@ -15,12 +15,15 @@
 
 package de.dreier.mytargets.features.settings.backup.provider
 
-import android.app.Activity
-
+import android.content.Context
+import android.content.Intent
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 
 interface IAsyncBackupRestore {
-    fun connect(activity: Activity, listener: ConnectionListener)
+    fun connect(
+        context: Context,
+        listener: ConnectionListener
+    )
 
     fun getBackups(listener: OnLoadFinishedListener)
 
@@ -28,12 +31,13 @@ interface IAsyncBackupRestore {
 
     fun deleteBackup(backup: BackupEntry, listener: BackupStatusListener)
 
-    fun stop()
+    fun onActivityResult(requestCode: Int, resultCode: Int, `data`: Intent?): Boolean
 
     interface ConnectionListener {
+        fun onStartIntent(intent: Intent, code: Int)
         fun onConnected()
-
         fun onConnectionSuspended()
+        fun onLoginCancelled()
     }
 
     interface OnLoadFinishedListener {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
index b3264c749..47c604c12 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
@@ -15,19 +15,19 @@
 
 package de.dreier.mytargets.features.settings.backup.provider
 
-import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.os.Environment
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 import de.dreier.mytargets.features.settings.backup.BackupException
-import de.dreier.mytargets.shared.SharedApplicationInstance.Companion
+import de.dreier.mytargets.shared.SharedApplicationInstance.Companion.getStr
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
-import java.util.*
+import java.lang.ref.WeakReference
 
 object InternalStorageBackup {
     private const val FOLDER_NAME = "MyTargets"
@@ -37,16 +37,16 @@ object InternalStorageBackup {
 
         directory.mkdir()
         if (!directory.exists() || !directory.isDirectory) {
-            throw IOException(Companion.getStr(R.string.dir_not_created))
+            throw IOException(getStr(R.string.dir_not_created))
         }
     }
 
     class AsyncRestore : IAsyncBackupRestore {
 
-        private var activity: Activity? = null
+        private var context: WeakReference<Context>? = null
 
-        override fun connect(activity: Activity, listener: IAsyncBackupRestore.ConnectionListener) {
-            this.activity = activity
+        override fun connect(context: Context, listener: IAsyncBackupRestore.ConnectionListener) {
+            this.context = WeakReference(context)
             listener.onConnected()
         }
 
@@ -54,16 +54,16 @@ object InternalStorageBackup {
             val backupDir = File(Environment.getExternalStorageDirectory(), FOLDER_NAME)
             if (backupDir.isDirectory) {
                 val backups = backupDir.listFiles()
-                    .filter { isBackup(it) }
-                    .map {
+                    ?.filter { isBackup(it) }
+                    ?.map {
                         BackupEntry(
                             it.absolutePath,
-                            Date(it.lastModified()),
+                            it.lastModified(),
                             it.length()
                         )
                     }
-                    .sortedByDescending { it.modifiedDate }
-                listener.onLoadFinished(backups)
+                    ?.sortedByDescending { it.lastModifiedAt }
+                listener.onLoadFinished(backups ?: emptyList())
             }
         }
 
@@ -78,7 +78,7 @@ object InternalStorageBackup {
         ) {
             val file = File(backup.fileId)
             try {
-                BackupUtils.importZip(activity!!, FileInputStream(file))
+                BackupUtils.importZip(context!!.get()!!, FileInputStream(file))
                 listener.onFinished()
             } catch (e: IOException) {
                 listener.onError(e.localizedMessage)
@@ -98,8 +98,8 @@ object InternalStorageBackup {
             }
         }
 
-        override fun stop() {
-            activity = null
+        override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+            return false
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
index 365c7a5f1..697761a3d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
@@ -28,21 +28,13 @@ import timber.log.Timber
 /**
  * Define a sync adapter for the app.
  *
- *
- *
  * This class is instantiated in [SyncService], which also binds SyncAdapter to the system.
  * SyncAdapter should only be initialized in SyncService, never anywhere else.
  *
- *
- *
  * The system calls onPerformSync() via an RPC call through the IBinder object supplied by
  * SyncService.
  */
-internal class SyncAdapter
-/**
- * Constructor. Obtains handle to content resolver for later use.
- */
-    (context: Context, autoInitialize: Boolean) :
+internal class SyncAdapter(context: Context, autoInitialize: Boolean) :
     AbstractThreadedSyncAdapter(context, autoInitialize) {
 
     /**
@@ -51,15 +43,10 @@ internal class SyncAdapter
      * done here. Extending AbstractThreadedSyncAdapter ensures that all methods within SyncAdapter
      * run on a background thread. For this reason, blocking I/O and other long-running tasks can be
      * run *in situ*, and you don't have to set up a separate thread for them.
-     * .
-     *
-     *
      *
      * This is where we actually perform any work required to perform a sync.
      * [AbstractThreadedSyncAdapter] guarantees that this will be called on a non-UI thread,
-     * so it is safe to peform blocking I/O here.
-     *
-     *
+     * so it is safe to perform blocking I/O here.
      *
      * The syncResult argument allows you to pass information back to the method that triggered
      * the sync.
@@ -68,15 +55,15 @@ internal class SyncAdapter
         account: Account, extras: Bundle, authority: String,
         provider: ContentProviderClient, syncResult: SyncResult
     ) {
-        Timber.e("Beginning network synchronization")
+        Timber.i("Beginning network synchronization")
         val backup = SettingsManager.backupLocation.createBackup()
         try {
             backup.performBackup(context)
         } catch (e: BackupException) {
-            e.printStackTrace()
+            Timber.w(e)
             syncResult.stats.numIoExceptions++
         }
 
-        Timber.e("Network synchronization complete")
+        Timber.i("Network synchronization complete")
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java
deleted file mode 100644
index 8f8bf7ae5..000000000
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.features.settings.backup.synchronization;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.support.annotation.Nullable;
-
-import timber.log.Timber;
-
-/**
- * Service to handle sync requests.
- * <p>
- * <p>This service is invoked in response to Intents with action android.content.SyncAdapter, and
- * returns a Binder connection to SyncAdapter.
- * <p>
- * <p>For performance, only one sync adapter will be initialized within this application's context.
- * <p>
- * <p>Note: The SyncService itself is not notified when a new sync occurs. It's role is to
- * manage the lifecycle of our {@link SyncAdapter} and provide a handle to said SyncAdapter to the
- * OS on request.
- */
-public class SyncService extends Service {
-
-    private static final Object sSyncAdapterLock = new Object();
-    @Nullable
-    private static SyncAdapter sSyncAdapter = null;
-
-    /**
-     * Thread-safe constructor, creates static {@link SyncAdapter} instance.
-     */
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Timber.i("Service created");
-        synchronized (sSyncAdapterLock) {
-            if (sSyncAdapter == null) {
-                sSyncAdapter = new SyncAdapter(getApplicationContext(), true);
-            }
-        }
-    }
-
-    /**
-     * Logging-only destructor.
-     */
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Timber.i("Service destroyed");
-    }
-
-    /**
-     * Return Binder handle for IPC communication with {@link SyncAdapter}.
-     * <p>
-     * <p>New sync requests will be sent directly to the SyncAdapter using this channel.
-     *
-     * @param intent Calling intent
-     * @return Binder handle for {@link SyncAdapter}
-     */
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sSyncAdapter.getSyncAdapterBinder();
-    }
-}
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.kt
new file mode 100644
index 000000000..abcf4632b
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.settings.backup.synchronization
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+import timber.log.Timber
+
+/**
+ * Service to handle sync requests.
+ *
+ * This service is invoked in response to Intents with action android.content.SyncAdapter, and
+ * returns a Binder connection to SyncAdapter.
+ *
+ * For performance, only one sync adapter will be initialized within this application's context.
+ *
+ * Note: The SyncService itself is not notified when a new sync occurs. It's role is to
+ * manage the lifecycle of our [SyncAdapter] and provide a handle to said SyncAdapter to the
+ * OS on request.
+ */
+class SyncService : Service() {
+
+    /**
+     * Thread-safe constructor, creates static [SyncAdapter] instance.
+     */
+    override fun onCreate() {
+        super.onCreate()
+        Timber.i("Service created")
+        synchronized(syncAdapterLock) {
+            if (syncAdapter == null) {
+                syncAdapter = SyncAdapter(applicationContext, true)
+            }
+        }
+    }
+
+    /**
+     * Logging-only destructor.
+     */
+    override fun onDestroy() {
+        super.onDestroy()
+        Timber.i("Sync Service destroyed")
+    }
+
+    /**
+     * Return Binder handle for IPC communication with [SyncAdapter].
+     *
+     * New sync requests will be sent directly to the SyncAdapter using this channel.
+     *
+     * @param intent Calling intent
+     * @return Binder handle for [SyncAdapter]
+     */
+    override fun onBind(intent: Intent): IBinder? {
+        return syncAdapter!!.syncAdapterBinder
+    }
+
+    companion object {
+        private val syncAdapterLock = Any()
+        private var syncAdapter: SyncAdapter? = null
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
index ccda0c214..110a58270 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
@@ -19,7 +19,7 @@ import android.accounts.AccountManager
 import android.content.ContentResolver
 import android.content.Context
 import android.os.Bundle
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.features.settings.SettingsManager
 
@@ -57,7 +57,7 @@ object SyncUtils {
     fun createSyncAccount(context: Context) {
         // Create account, if it's missing. (Either first run, or user has deleted account.)
         val account = GenericAccountService.account
-        val accountManager = context.systemService<AccountManager>()
+        val accountManager = context.getSystemService<AccountManager>()!!
         if (accountManager.addAccountExplicitly(account, null, null)) {
             // Inform the system that this account supports sync
             ContentResolver.setIsSyncable(account, CONTENT_AUTHORITY, 1)
@@ -69,12 +69,9 @@ object SyncUtils {
     /**
      * Helper method to trigger an immediate sync ("refresh").
      *
-     *
-     *
      * This should only be used when we need to preempt the normal sync schedule. Typically, this
      * means the user has pressed the "refresh" button.
      *
-     *
      * Note that SYNC_EXTRAS_MANUAL will cause an immediate sync, without any optimization to
      * preserve battery life. If you know new data is available (perhaps via a GCM notification),
      * but the user is not actively waiting for that data, you should omit this flag; this will give
@@ -85,10 +82,6 @@ object SyncUtils {
         // Disable sync backoff and ignore sync preferences. In other words...perform sync NOW!
         b.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)
         b.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)
-        ContentResolver.requestSync(
-            GenericAccountService.account,
-            CONTENT_AUTHORITY,
-            b
-        )
+        ContentResolver.requestSync(GenericAccountService.account, CONTENT_AUTHORITY, b)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index 6f5d87f84..46ce2390b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -16,16 +16,16 @@
 package de.dreier.mytargets.features.statistics
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Build
 import android.os.Bundle
 import android.print.PrintAttributes
 import android.print.PrintManager
-import android.support.annotation.RequiresApi
-import android.support.design.widget.Snackbar
+import androidx.annotation.RequiresApi
 import android.view.Menu
 import android.view.MenuItem
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
+import com.google.android.material.snackbar.Snackbar
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.databinding.ActivityArrowRankingDetailsBinding
@@ -119,7 +119,7 @@ class DispersionPatternActivity : ChildActivityBase() {
         val pda = CustomPrintDocumentAdapter(DrawableToPdfWriter(target), fileName)
 
         // Create a print job with name and adapter instance
-        val printManager = systemService<PrintManager>()
+        val printManager = getSystemService<PrintManager>()!!
         val jobName = "Dispersion Pattern"
         printManager.print(jobName, pda, PrintAttributes.Builder().build())
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
index 329eaffb5..85cb20905 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
@@ -21,7 +21,7 @@ import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
 import android.print.PageRange
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.targets.drawable.TargetImpactAggregationDrawable
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 0d74575cd..8fc62f273 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -20,15 +20,15 @@ import android.app.LoaderManager
 import android.content.AsyncTaskLoader
 import android.content.Intent
 import android.content.Loader
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
-import android.support.v4.view.GravityCompat.END
+import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.core.view.GravityCompat.END
 import android.view.Menu
 import android.view.MenuItem
 import com.afollestad.materialdialogs.MaterialDialog
@@ -101,7 +101,7 @@ class StatisticsActivity : ChildActivityBase(),
                     .distinct()
                     .map { id -> Pair(id, trainingDAO.loadTraining(id)) }
                     .toSparseArray()
-                return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!), round) }
+                return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!)!!, round) }
             }
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index f17ccee3e..c0d9f0051 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -16,13 +16,13 @@
 package de.dreier.mytargets.features.statistics
 
 import android.content.IntentFilter
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.LocalBroadcastManager
-import android.support.v7.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
index a7d368c36..92430f327 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.statistics
 
 import android.content.Context
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import android.view.LayoutInflater
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
index 17b8464bf..9730a0130 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.features.timer
 
-import android.app.Fragment
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.utils.Utils
@@ -30,14 +30,14 @@ class TimerActivity : ChildActivityBase() {
         if (savedInstanceState == null) {
             // Create the fragment only when the activity is created for the first time.
             // ie. not after orientation changes
-            childFragment = fragmentManager.findFragmentByTag(FRAGMENT_TAG)
+            childFragment = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)
             if (childFragment == null) {
                 childFragment = instantiateFragment()
                 childFragment?.arguments = intent?.extras
             }
 
-            fragmentManager.beginTransaction()
-                .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
+            supportFragmentManager.beginTransaction()
+                .replace(android.R.id.content, childFragment!!, FRAGMENT_TAG)
                 .commit()
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
index 3af544f6f..763c085f6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.features.timer
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -61,9 +61,9 @@ class TimerFragment : TimerFragmentBase() {
     override fun applyStatus(status: ETimerState) {
         binding.root.setBackgroundResource(status.color)
         if (Utils.isLollipop && activity != null) {
-            val window = activity.window
+            val window = activity!!.window
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-            window.statusBarColor = ContextCompat.getColor(activity, status.color)
+            window.statusBarColor = ContextCompat.getColor(activity!!, status.color)
         }
         binding.timerStatus.setText(getStatusText(status))
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
index 23e87da25..731793e5f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 import de.dreier.mytargets.features.rounds.EditRoundFragment
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
index 87fe7b8a6..34db8c3d3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index acb9505fd..630f9fe6b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -16,9 +16,9 @@
 package de.dreier.mytargets.features.training
 
 import android.content.IntentFilter
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.text.InputType
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
@@ -102,7 +102,7 @@ class RoundFragment :
         binding.fab.visibility = View.GONE
         binding.fab.setOnClickListener {
             navigationController
-                .navigateToEditEnd(round!!, binding.recyclerView.adapter.itemCount)
+                .navigateToEditEnd(round!!, binding.recyclerView.adapter!!.itemCount)
                 .fromFab(binding.fab)
                 .start()
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
index 508549650..5b3fccccb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 import de.dreier.mytargets.features.training.details.TrainingFragment
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 6916fb74e..bde9e294f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.features.training.details
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.annotation.CallSuper
+import androidx.annotation.CallSuper
 import android.text.InputType
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
index d1dea56f5..fbb6cc8ca 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.features.training.details
 
 import android.app.Application
-import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Transformations
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.shared.models.db.Round
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
index cf18a68df..81fd82241 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.training.edit
 import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
 import org.threeten.bp.LocalDate
 
 class DatePickerFragment : DialogFragment() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
index fee8b95cc..7980b9fd7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.edit
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index dcef774cd..52d470fa0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.training.edit
 import android.app.Activity
 import android.app.DatePickerDialog
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
index 6b8988474..53b1d081b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
@@ -17,8 +17,9 @@ package de.dreier.mytargets.features.training.environment
 
 import android.content.Context
 import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.net.NetworkInfo
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
 
 internal object Connectivity {
 
@@ -26,7 +27,7 @@ internal object Connectivity {
      * Get the network info
      */
     private fun getNetworkInfo(context: Context): NetworkInfo? {
-        return context.systemService<ConnectivityManager>().activeNetworkInfo
+        return context.getSystemService<ConnectivityManager>()?.activeNetworkInfo
     }
 
     /**
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
index 3e11cc619..3c3c68522 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.environment
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.MenuItem
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
index 276f8f3a7..d1f88829d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
@@ -15,9 +15,9 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v7.widget.SwitchCompat
+import androidx.appcompat.widget.SwitchCompat
 import android.view.*
 import android.view.View.GONE
 import android.view.View.VISIBLE
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index 6f5d7a25b..1fdad0334 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -23,8 +23,8 @@ import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
-import android.support.annotation.RequiresPermission
-import androidx.core.content.systemService
+import androidx.annotation.RequiresPermission
+import androidx.core.content.getSystemService
 import timber.log.Timber
 
 /**
@@ -33,7 +33,7 @@ import timber.log.Timber
  * @author emil http://stackoverflow.com/users/220710/emil
  */
 class Locator(private val context: Context) : LocationListener {
-    private val locationManager = context.systemService<LocationManager>()
+    private val locationManager = context.getSystemService<LocationManager>()!!
     private var method: Locator.Method? = null
     private var callback: Locator.Listener? = null
 
@@ -50,8 +50,8 @@ class Locator(private val context: Context) : LocationListener {
         this.callback = callback
         when (this.method) {
             Locator.Method.NETWORK, Locator.Method.NETWORK_THEN_GPS -> {
-                val networkLocation = locationManager
-                    .getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
+                val networkLocation =
+                    locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
                 if (networkLocation != null) {
                     Timber.d(
                         "Last known location found for network provider : %s", networkLocation
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
index 822017515..c13415a50 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.environment
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class WindDirectionActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index 430f0fc46..60ec5ce67 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
index af902909f..72e1429e9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.environment
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class WindSpeedActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index 4d1d2bc42..a1a02896c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 0fde49d96..6d3f13421 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -20,16 +20,16 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.RequiresApi
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.Loader
-import android.support.v4.content.LocalBroadcastManager
+import androidx.annotation.RequiresApi
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.AsyncTaskLoader
+import androidx.core.content.ContextCompat
+import androidx.loader.content.Loader
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.text.InputType
 import android.transition.Transition
 import android.view.Menu
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 20884a5e7..ff1112ae4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.features.training.overview
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
 import android.view.*
 import de.dreier.mytargets.R
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt
index 5421190b3..50d8207a8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt
@@ -16,8 +16,8 @@
 package de.dreier.mytargets.features.training.overview
 
 import android.app.Application
-import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
index 2e34eecd9..5aad7028d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.standardround
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index c284f473c..9395caa04 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -16,9 +16,9 @@ package de.dreier.mytargets.features.training.standardround
 
 import android.app.Activity
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
index 7e6f55675..412c77ea9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
@@ -14,7 +14,7 @@
  */
 package de.dreier.mytargets.features.training.standardround
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class StandardRoundActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 695c11417..a95f70718 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -18,13 +18,13 @@ package de.dreier.mytargets.features.training.standardround
 import android.app.Activity.RESULT_OK
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.util.LongSparseArray
-import android.support.v7.widget.SearchView
 import android.view.*
 import android.widget.EditText
 import android.widget.ImageView
+import androidx.appcompat.widget.SearchView
+import androidx.collection.LongSparseArray
+import androidx.databinding.DataBindingUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
@@ -98,7 +98,7 @@ class StandardRoundListFragment :
                 it,
                 standardRoundDAO.loadRoundTemplates(it.id).toMutableList()
             )
-        }.toMutableList()
+        }
         return {
             adapter.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
index a5cb2ccbd..e35325217 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.target
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class TargetActivity : SimpleFragmentActivityBase() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index c5aaaff37..49a51e23d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.features.training.target
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
index fac5373bc..05d5f74e0 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
@@ -19,9 +19,9 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.util.AttributeSet
 import android.view.View
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
index a1fd81e12..0dd961e79 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.utils
 
 import android.content.Context
 import android.net.Uri
-import android.support.v4.content.FileProvider
+import androidx.core.content.FileProvider
 import java.io.File
 import java.io.IOException
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
index d3f9a4bd7..826b3344e 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
@@ -22,8 +22,8 @@ import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.annotation.ColorRes
-import android.support.v4.app.Fragment
+import androidx.annotation.ColorRes
+import androidx.fragment.app.Fragment
 import android.view.View
 import de.dreier.mytargets.R
 import de.dreier.mytargets.utils.transitions.FabTransform
diff --git a/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt b/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt
index 6251f809f..62666ec17 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.utils
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MediatorLiveData
-import android.support.annotation.MainThread
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.annotation.MainThread
 
 class LiveDataUtil2<A, B, Y> {
 
@@ -88,4 +88,4 @@ class LiveDataUtil2<A, B, Y> {
         })
         return result
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
index 162031984..58c6dc173 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.utils
 
-import android.support.v4.util.LongSparseArray
+import androidx.collection.LongSparseArray
 
 inline fun <reified T> List<Pair<Long, T>>.toSparseArray(): LongSparseArray<T> {
     val array = LongSparseArray<T>(size)
@@ -29,7 +29,7 @@ inline fun <reified T, R> LongSparseArray<T>.map(transform: (Pair<Long, T>) -> R
     val list = ArrayList<R>(size())
     for (i in 0 until size()) {
         val key = keyAt(i)
-        val value = get(key)
+        val value = get(key)!!
         list.add(transform.invoke(Pair(key, value)))
     }
     return list
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
index 86e7d2179..5ffc1ab89 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
@@ -19,7 +19,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.TrainingInfo
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index 4e191e797..20041958c 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.utils
 
-import android.support.v4.util.Pair
+import androidx.core.util.Pair
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.shared.models.SelectableZone
diff --git a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
index 8f87a41cc..fbf76f95d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
@@ -18,9 +18,9 @@ package de.dreier.mytargets.utils
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.os.Handler
-import android.support.v4.view.animation.LinearOutSlowInInterpolator
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.RecyclerView
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.RecyclerView
 import android.view.Gravity
 import android.view.View
 import java.util.*
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
index 5e33dcbb7..3a2f8eaf1 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
@@ -15,15 +15,12 @@
 
 package de.dreier.mytargets.utils
 
-import android.support.annotation.StringRes
-import android.support.v4.app.Fragment
-import android.support.v4.view.ViewCompat
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
-import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.R
 
-
 object ToolbarUtils {
 
     fun showUpAsX(fragment: Fragment) {
@@ -50,18 +47,6 @@ object ToolbarUtils {
         activity!!.setSupportActionBar(toolbar)
     }
 
-    fun setToolbarTransitionName(toolbar: Toolbar) {
-        var textViewTitle: TextView? = null
-        for (i in 0 until toolbar.childCount) {
-            val view = toolbar.getChildAt(i)
-            if (view is TextView) {
-                textViewTitle = view
-                break
-            }
-        }
-        ViewCompat.setTransitionName(textViewTitle, "title")
-    }
-
     fun setTitle(fragment: Fragment, @StringRes title: Int) {
         setTitle((fragment.activity as AppCompatActivity?)!!, title)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index a4a4e7745..44e1bbb35 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -26,13 +26,12 @@ import android.graphics.Color
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Process
-import android.support.media.ExifInterface
+import androidx.exifinterface.media.ExifInterface
 import android.text.Html
 import android.text.Spanned
 import android.view.View
 import android.view.WindowManager
-import androidx.core.content.systemService
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.features.training.overview.Header
 import de.dreier.mytargets.utils.transitions.FabTransform
@@ -71,7 +70,7 @@ object Utils {
         val mPendingIntentId = 223344
         val mPendingIntent = PendingIntent
                 .getActivity(context, mPendingIntentId, intent, PendingIntent.FLAG_CANCEL_CURRENT)
-        context.systemService<AlarmManager>()
+        context.getSystemService<AlarmManager>()!!
             .set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent)
 
         // Kill the application
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
index 0cb6a3a83..a4f099863 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.utils.databinding
 
-import android.databinding.BindingAdapter
-import android.support.design.widget.TextInputLayout
+import androidx.databinding.BindingAdapter
 import android.view.View
 import android.widget.ImageView
+import com.google.android.material.textfield.TextInputLayout
 
 object DataBindingAdapters {
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
index cb957d038..966fad6ca 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -15,10 +15,10 @@
 
 package de.dreier.mytargets.utils.databinding
 
-import android.databinding.BindingAdapter
-import android.databinding.InverseBindingAdapter
-import android.databinding.InverseBindingListener
-import android.support.v7.widget.AppCompatSpinner
+import androidx.databinding.BindingAdapter
+import androidx.databinding.InverseBindingAdapter
+import androidx.databinding.InverseBindingListener
+import androidx.appcompat.widget.AppCompatSpinner
 import android.view.View
 import android.widget.AdapterView
 import android.widget.Spinner
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
index 0bf2d0295..68173b2ad 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.utils.multiselector
 
-import android.support.annotation.IdRes
+import androidx.annotation.IdRes
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
index 9ed54e22a..d1f842160 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.utils.multiselector
 
-import android.support.v7.widget.RebindReportingHolder
+import androidx.recyclerview.widget.RebindReportingHolder
 import android.view.View
 
 abstract class ItemBindingHolder<T> internal constructor(itemView: View) :
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
index bee67a17a..62666f4bf 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.utils.multiselector
 
 import android.os.Bundle
-import android.support.annotation.CallSuper
+import androidx.annotation.CallSuper
 
 abstract class SelectorBase {
     protected var tracker = WeakHolderTracker()
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
index 7943233ab..0717577bb 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
@@ -23,7 +23,7 @@ import android.print.PageRange
 import android.print.PrintAttributes
 import android.print.PrintDocumentAdapter
 import android.print.PrintDocumentInfo
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import java.io.FileOutputStream
 
 @RequiresApi(api = Build.VERSION_CODES.KITKAT)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
index de8d5cc9c..8693c89df 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
@@ -23,7 +23,7 @@ import android.graphics.pdf.PdfDocument
 import android.os.Build
 import android.print.PageRange
 import android.print.PrintAttributes
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import de.dreier.mytargets.shared.utils.RectUtils
 import de.dreier.mytargets.shared.utils.toClosestRect
 import java.io.IOException
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
index 58836dbbb..ff5a60de2 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
@@ -21,7 +21,7 @@ import android.graphics.pdf.PdfDocument
 import android.os.Build
 import android.print.PageRange
 import android.print.PrintAttributes
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.view.View
 import android.view.View.MeasureSpec.EXACTLY
 import android.view.View.MeasureSpec.makeMeasureSpec
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
index 563eb3f3d..32644a6c4 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
@@ -25,14 +25,14 @@ import android.graphics.Outline
 import android.graphics.Rect
 import android.graphics.drawable.ColorDrawable
 import android.os.Build.VERSION_CODES.LOLLIPOP
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.annotation.DrawableRes
-import android.support.annotation.RequiresApi
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.animation.FastOutLinearInInterpolator
-import android.support.v4.view.animation.FastOutSlowInInterpolator
-import android.support.v4.view.animation.LinearOutSlowInInterpolator
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
 import android.transition.Transition
 import android.transition.TransitionValues
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
index c01d865d4..f2a53659e 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.utils.transitions
 
 import android.graphics.Path
 import android.os.Build
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.transition.ArcMotion
 
 /**
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
index 09b8b94ce..4aae096cd 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
@@ -18,8 +18,8 @@ package de.dreier.mytargets.utils.transitions
 import android.animation.Animator
 import android.animation.TimeInterpolator
 import android.os.Build
-import android.support.annotation.RequiresApi
-import android.support.v4.util.ArrayMap
+import androidx.annotation.RequiresApi
+import androidx.collection.ArrayMap
 import java.util.*
 
 /**
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
index 4acdbe4f9..b2b62390f 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.utils.transitions
 
 import android.os.Build
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.transition.Transition
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
diff --git a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
index fa5c0831a..670c7c1ad 100644
--- a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
@@ -16,9 +16,9 @@
 package de.dreier.mytargets.views
 
 import android.content.Context
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Handler
-import android.support.annotation.PluralsRes
+import androidx.annotation.PluralsRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.MotionEvent
diff --git a/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt b/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
index ec09f6bed..a8670a406 100644
--- a/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
@@ -17,12 +17,13 @@ package de.dreier.mytargets.views
 
 import android.content.Context
 import android.os.Build
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.util.AttributeSet
 import android.view.View
+import com.google.android.material.textfield.TextInputEditText
 
 
-class TextInputEditText : android.support.design.widget.TextInputEditText {
+class TextInputEditText : TextInputEditText {
 
     constructor(context: Context) : super(context)
 
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index 06a75fa63..889df32b2 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -23,9 +23,9 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.location.Geocoder
 import android.location.Location
-import android.support.annotation.RequiresPermission
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
+import androidx.annotation.RequiresPermission
+import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
index 1bf0c27a3..15b0cfae5 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
@@ -18,10 +18,10 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
-import android.databinding.ViewDataBinding
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
 import android.os.Parcelable
-import android.support.annotation.LayoutRes
+import androidx.annotation.LayoutRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
index 5bcc0ee59..af52695fd 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
@@ -25,18 +25,6 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
-import android.support.annotation.IdRes
-import android.support.design.internal.NavigationMenu
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.ViewCompat
-import android.support.v4.view.ViewPropertyAnimatorListenerAdapter
-import android.support.v4.view.animation.FastOutLinearInInterpolator
-import android.support.v4.view.animation.FastOutSlowInInterpolator
-import android.support.v7.view.SupportMenuInflater
-import android.support.v7.view.menu.MenuBuilder
-import android.support.v7.widget.CardView
 import android.text.TextUtils
 import android.util.AndroidRuntimeException
 import android.util.AttributeSet
@@ -45,6 +33,18 @@ import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.annotation.IdRes
+import androidx.appcompat.view.SupportMenuInflater
+import androidx.appcompat.view.menu.MenuBuilder
+import androidx.cardview.widget.CardView
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.ViewPropertyAnimatorListenerAdapter
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.internal.NavigationMenu
 import de.dreier.mytargets.R
 import timber.log.Timber
 import java.util.*
@@ -326,11 +326,12 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
 
     override fun onSaveInstanceState(): Parcelable? {
         val superState = super.onSaveInstanceState()
-        val ss = SavedState(superState)
-
-        ss.isShowingMenu = isMenuOpen
-
-        return ss
+        if (superState != null) {
+            val ss = SavedState(superState)
+            ss.isShowingMenu = isMenuOpen
+            return ss
+        }
+        return null
     }
 
     override fun onRestoreInstanceState(state: Parcelable) {
@@ -472,7 +473,7 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
             touchGuard!!.visibility = View.GONE
         }
 
-        ViewCompat.animate(menuItemsLayout)
+        ViewCompat.animate(menuItemsLayout!!)
             .setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
             .alpha(0f)
             .setInterpolator(FastOutLinearInInterpolator())
@@ -564,7 +565,7 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         return super.dispatchKeyEventPreIme(event)
     }
 
-    internal class SavedState : View.BaseSavedState {
+    internal class SavedState : BaseSavedState {
 
         var isShowingMenu: Boolean = false
 
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
index bd1bf34da..60f849db3 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.views.speeddial
 
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.Snackbar
-import android.support.v4.view.animation.FastOutSlowInInterpolator
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import android.view.View
 import android.view.ViewPropertyAnimator
+import com.google.android.material.snackbar.Snackbar
 
 object FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial>() {
 
diff --git a/app/src/main/res/drawable/about_icon_google_plus.xml b/app/src/main/res/drawable/about_icon_google_plus.xml
deleted file mode 100644
index 957f6157d..000000000
--- a/app/src/main/res/drawable/about_icon_google_plus.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (C) 2018 Florian Dreier
-  ~
-  ~ This file is part of MyTargets.
-  ~
-  ~ MyTargets is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License version 2
-  ~ as published by the Free Software Foundation.
-  ~
-  ~ MyTargets is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  -->
-
-<vector android:height="24dp"
-        android:viewportHeight="48.0"
-        android:viewportWidth="48.0"
-        android:width="24dp"
-        xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M23.2,27.2l-2,-1.6c-0.8,-0.4 -1.6,-1.2 -1.6,-2.4c0,-1.2 0.8,-2 1.6,-2.8c2.4,-2 4.8,-4 4.8,-8.4s-2.8,-6.8 -4,-8h3.6l3.6,-2h-12c-3.2,0 -7.2,0.4 -10.8,2.4c-2.4,2 -3.6,4.8 -3.6,7.6c0,4.8 3.2,9.2 9.6,9.2h2c0,0.8 -0.4,1.6 -0.4,2.4c0,2 0.8,2.8 1.6,4c-2.8,0.4 -7.6,0.8 -11.2,2.8c-3.2,2 -4.4,5.2 -4.4,7.2c0,4.4 4,8.4 12.4,8.4c10.4,0 15.6,-5.6 15.6,-10.8C28,31.2 25.6,29.2 23.2,27.2zM15.2,20.4c-4.8,0 -7.2,-6.4 -7.2,-10.4c0,-1.2 0.4,-2.8 1.6,-4.4c0.8,-1.2 2.4,-2 4,-2c4.8,0 7.2,6.8 7.2,10.8c0,1.2 0,3.2 -1.6,4.4C18.4,19.6 16.8,20.4 15.2,20.4zM15.6,43.6c-6.4,0 -10.4,-3.2 -10.4,-7.2c0,-4 4,-5.6 5.2,-6c2.4,-0.8 5.6,-0.8 6,-0.8h1.2c4.4,3.2 6.4,4.8 6.4,7.6C24,40.8 21.2,43.6 15.6,43.6z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M36,14l4,0l0,8l8,0l0,4l-8,0l0,8l-4,0l0,-8l-8,0l0,-4l8,0z"/>
-</vector>
diff --git a/app/src/main/res/drawable/about_icon_slack.xml b/app/src/main/res/drawable/about_icon_slack.xml
new file mode 100644
index 000000000..7a78f910f
--- /dev/null
+++ b/app/src/main/res/drawable/about_icon_slack.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ Copyright (C) 2019 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5,15.2c0,1.4 -1.1,2.5 -2.5,2.5c-1.4,0 -2.5,-1.1 -2.5,-2.5c0,-1.4 1.1,-2.5 2.5,-2.5H5C5,12.6 5,15.2 5,15.2z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.3,15.2c0,-1.4 1.1,-2.5 2.5,-2.5c1.4,0 2.5,1.1 2.5,2.5v6.3c0,1.4 -1.1,2.5 -2.5,2.5c-1.4,0 -2.5,-1.1 -2.5,-2.5C6.3,21.5 6.3,15.2 6.3,15.2z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.8,5C7.4,5 6.3,3.9 6.3,2.5C6.3,1.1 7.4,0 8.8,0c1.4,0 2.5,1.1 2.5,2.5V5H8.8z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.8,6.3c1.4,0 2.5,1.1 2.5,2.5c0,1.4 -1.1,2.5 -2.5,2.5H2.5C1.1,11.4 0,10.2 0,8.8c0,-1.4 1.1,-2.5 2.5,-2.5C2.5,6.3 8.8,6.3 8.8,6.3z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,8.8c0,-1.4 1.1,-2.5 2.5,-2.5c1.4,0 2.5,1.1 2.5,2.5c0,1.4 -1.1,2.5 -2.5,2.5H19C19,11.4 19,8.8 19,8.8z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.7,8.8c0,1.4 -1.1,2.5 -2.5,2.5c-1.4,0 -2.5,-1.1 -2.5,-2.5V2.5c0,-1.4 1.1,-2.5 2.5,-2.5c1.4,0 2.5,1.1 2.5,2.5V8.8z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.2,19c1.4,0 2.5,1.1 2.5,2.5c0,1.4 -1.1,2.5 -2.5,2.5c-1.4,0 -2.5,-1.1 -2.5,-2.5V19C12.6,19 15.2,19 15.2,19z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.2,17.7c-1.4,0 -2.5,-1.1 -2.5,-2.5c0,-1.4 1.1,-2.5 2.5,-2.5h6.3c1.4,0 2.5,1.1 2.5,2.5c0,1.4 -1.1,2.5 -2.5,2.5C21.5,17.7 15.2,17.7 15.2,17.7z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
index 9931596b5..e28c9451d 100755
--- a/app/src/main/res/layout/activity_gallery.xml
+++ b/app/src/main/res/layout/activity_gallery.xml
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/imagesHorizontalList"
             android:layout_width="match_parent"
             android:layout_height="70dp"
@@ -45,7 +45,7 @@
             android:layout_alignParentTop="true"
             android:fitsSystemWindows="true">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_input.xml b/app/src/main/res/layout/activity_input.xml
index b8183157e..bb9677e3b 100644
--- a/app/src/main/res/layout/activity_input.xml
+++ b/app/src/main/res/layout/activity_input.xml
@@ -24,7 +24,7 @@
         android:transitionName="@string/transition_root_view"
         tools:targetApi="lollipop">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -33,7 +33,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
         <FrameLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 365b1a107..8fe8c2013 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         tools:context=".features.main.MainActivity">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-            <android.support.design.widget.BottomNavigationView
+            <com.google.android.material.bottomnavigation.BottomNavigationView
                 android:id="@+id/bottom_navigation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
 
         </RelativeLayout>
 
-        <android.support.design.widget.NavigationView
+        <com.google.android.material.navigation.NavigationView
             android:id="@+id/navigationView"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -67,6 +67,6 @@
             app:headerLayout="@layout/navigation_drawer_header"
             app:menu="@menu/navigation_drawer_main"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index ac192b9e0..beca09b56 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -23,7 +23,7 @@
         android:background="?attr/colorPrimary"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -31,7 +31,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.v4.widget.DrawerLayout
+        <androidx.drawerlayout.widget.DrawerLayout
             android:id="@+id/drawer_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -41,13 +41,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.v4.view.ViewPager
+                <androidx.viewpager.widget.ViewPager
                     android:id="@+id/viewPager"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#fafafa">
 
-                    <android.support.v4.view.PagerTitleStrip
+                    <androidx.viewpager.widget.PagerTitleStrip
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="top"
@@ -56,9 +56,9 @@
                         android:paddingTop="4dp"
                         android:textColor="#fff"/>
 
-                </android.support.v4.view.ViewPager>
+                </androidx.viewpager.widget.ViewPager>
 
-                <android.support.v4.widget.ContentLoadingProgressBar
+                <androidx.core.widget.ContentLoadingProgressBar
                     android:id="@+id/progressBar"
                     style="?android:attr/progressBarStyle"
                     android:layout_width="wrap_content"
@@ -96,7 +96,7 @@
                     android:layout_above="@id/reset"
                     android:background="@color/md_grey_200"/>
 
-                <android.support.v4.widget.NestedScrollView
+                <androidx.core.widget.NestedScrollView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_above="@id/separator"
@@ -169,11 +169,11 @@
 
                     </LinearLayout>
 
-                </android.support.v4.widget.NestedScrollView>
+                </androidx.core.widget.NestedScrollView>
 
             </RelativeLayout>
 
-        </android.support.v4.widget.DrawerLayout>
+        </androidx.drawerlayout.widget.DrawerLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fab_menu_item_end.xml b/app/src/main/res/layout/fab_menu_item_end.xml
index cc3a4a5cf..d6cc82114 100755
--- a/app/src/main/res/layout/fab_menu_item_end.xml
+++ b/app/src/main/res/layout/fab_menu_item_end.xml
@@ -23,7 +23,7 @@
               android:layout_marginTop="@dimen/fab_menu_item_margin_top"
               android:orientation="horizontal">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/card_view"
         style="@style/TitleCardView"
         android:layout_width="match_parent"
@@ -35,9 +35,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/mini_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fab_speed_dial_bottom.xml b/app/src/main/res/layout/fab_speed_dial_bottom.xml
index 9431a8d43..740c5764f 100755
--- a/app/src/main/res/layout/fab_speed_dial_bottom.xml
+++ b/app/src/main/res/layout/fab_speed_dial_bottom.xml
@@ -25,7 +25,7 @@
         android:clipToPadding="false"
         android:orientation="vertical"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_arrows.xml b/app/src/main/res/layout/fragment_arrows.xml
index 8c7de7b52..dd1dc62fc 100644
--- a/app/src/main/res/layout/fragment_arrows.xml
+++ b/app/src/main/res/layout/fragment_arrows.xml
@@ -17,13 +17,13 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             style="@style/card_list"
             app:layoutManager="LinearLayoutManager"/>
@@ -35,7 +35,7 @@
             app:image="@{de.dreier.mytargets.R.drawable.ic_arrow_24dp}"
             app:text="@{de.dreier.mytargets.R.string.no_arrows}"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -45,6 +45,6 @@
             android:transitionName="@string/transition_root_view"
             tools:targetApi="lollipop"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
index 43b1915ad..0c7b6aa24 100644
--- a/app/src/main/res/layout/fragment_backup.xml
+++ b/app/src/main/res/layout/fragment_backup.xml
@@ -23,7 +23,7 @@
         android:background="#ffffff"
         android:orientation="vertical">
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -145,7 +145,7 @@
                     android:layout_gravity="center_horizontal"
                     android:padding="16dp"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recentBackupsList"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -155,7 +155,7 @@
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_bows.xml b/app/src/main/res/layout/fragment_bows.xml
index e9c09c091..b85afadc6 100644
--- a/app/src/main/res/layout/fragment_bows.xml
+++ b/app/src/main/res/layout/fragment_bows.xml
@@ -16,12 +16,12 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             style="@style/card_list"
             app:layoutManager="LinearLayoutManager"/>
@@ -41,6 +41,6 @@
             app:fabMenu="@menu/fab_bows"
             app:miniFabBackgroundTint="@color/colorPrimary"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_distance.xml b/app/src/main/res/layout/fragment_distance.xml
index 38a9d267a..06b243a3b 100644
--- a/app/src/main/res/layout/fragment_distance.xml
+++ b/app/src/main/res/layout/fragment_distance.xml
@@ -15,7 +15,7 @@
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                 android:id="@+id/slidingTabs"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -32,13 +32,13 @@
                 android:textColor="@color/tab_layout_text"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
         </LinearLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_edit_arrow.xml b/app/src/main/res/layout/fragment_edit_arrow.xml
index 734c4ca68..945931804 100644
--- a/app/src/main/res/layout/fragment_edit_arrow.xml
+++ b/app/src/main/res/layout/fragment_edit_arrow.xml
@@ -42,7 +42,7 @@
                 android:contentDescription="@string/name"
                 app:srcCompat="@drawable/ic_title_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/name"
@@ -52,7 +52,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.name}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -63,7 +63,7 @@
                 android:contentDescription="@string/max_arrow_number"
                 app:srcCompat="@drawable/ic_arrow_number_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/maxArrowNumberTextInputLayout"
                 style="@style/propertyTextInputLayout">
 
@@ -75,7 +75,7 @@
                     android:inputType="number"
                     android:text="@={`` + arrow.maxArrowNumber}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -90,7 +90,7 @@
                 android:contentDescription="@string/length"
                 app:srcCompat="@drawable/ic_arrow_length_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/length"
@@ -100,7 +100,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.length}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -115,7 +115,7 @@
                 android:contentDescription="@string/material"
                 app:srcCompat="@drawable/ic_arrow_material_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/material"
@@ -125,7 +125,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.material}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -140,7 +140,7 @@
                 android:contentDescription="@string/spine"
                 app:srcCompat="@drawable/ic_arrow_spine_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/spine"
@@ -150,7 +150,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.spine}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -167,7 +167,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/diameterTextInputLayout"
                     style="@style/propertyTextInputLayout"
                     android:layout_toLeftOf="@+id/diameterUnit"
@@ -182,7 +182,7 @@
                         android:inputType="numberDecimal"
                         android:text="@={``+arrow.diameterValue}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <Spinner
                     android:id="@+id/diameterUnit"
@@ -210,7 +210,7 @@
                 android:contentDescription="@string/weight"
                 app:srcCompat="@drawable/ic_arrow_weight_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/weight"
@@ -220,7 +220,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.weight}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -235,7 +235,7 @@
                 android:contentDescription="@string/tip_weight"
                 app:srcCompat="@drawable/ic_arrow_tip_weight_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/tip_weight"
@@ -245,7 +245,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.tipWeight}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -260,7 +260,7 @@
                 android:contentDescription="@string/vanes"
                 app:srcCompat="@drawable/ic_arrow_vanes_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/vanes"
@@ -270,7 +270,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.vanes}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -285,7 +285,7 @@
                 android:contentDescription="@string/nock"
                 app:srcCompat="@drawable/ic_arrow_nock_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/nock"
@@ -295,7 +295,7 @@
                     android:inputType="textNoSuggestions"
                     android:text="@={arrow.nock}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
@@ -310,7 +310,7 @@
                 android:contentDescription="@string/comment"
                 app:srcCompat="@drawable/ic_comment_grey600_24dp"/>
 
-            <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                 <de.dreier.mytargets.views.TextInputEditText
                     android:id="@+id/comment"
@@ -320,7 +320,7 @@
                     android:inputType="textMultiLine"
                     android:text="@={arrow.comment}"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_edit_bow.xml b/app/src/main/res/layout/fragment_edit_bow.xml
index f073974e4..32b9aa333 100644
--- a/app/src/main/res/layout/fragment_edit_bow.xml
+++ b/app/src/main/res/layout/fragment_edit_bow.xml
@@ -56,7 +56,7 @@
                     android:tint="@color/md_grey_600"
                     tools:src="@drawable/ic_bow_recurve_white_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                         android:text="@{bow.type.toString()}"
                         android:textColor="@color/primaryTextDefaultMaterialLight"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -77,7 +77,7 @@
                     android:contentDescription="@string/name"
                     app:srcCompat="@drawable/ic_title_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/name"
@@ -87,7 +87,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.name}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -98,7 +98,7 @@
                     android:contentDescription="@string/brand"
                     app:srcCompat="@drawable/ic_brand_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/brand"
@@ -108,7 +108,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.brand}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -123,7 +123,7 @@
                     android:contentDescription="@string/size"
                     app:srcCompat="@drawable/ic_arrow_length_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/size"
@@ -133,7 +133,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.size}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -152,7 +152,7 @@
                     style="@style/propertyTextInputLayout"
                     android:orientation="vertical">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showDrawWeight}"
@@ -167,9 +167,9 @@
                             android:inputType="numberDecimal"
                             android:text="@{bow.drawWeight}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showLetoffWeight}"
@@ -184,7 +184,7 @@
                             android:inputType="numberDecimal"
                             android:text="@{bow.letoffWeight}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
@@ -205,7 +205,7 @@
                     style="@style/propertyTextInputLayout"
                     android:orientation="vertical">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showArrowRest}"
@@ -220,9 +220,9 @@
                             android:inputType="textNoSuggestions"
                             android:text="@{bow.arrowRest}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showArrowRest}"
@@ -237,9 +237,9 @@
                             android:inputType="textNoSuggestions"
                             android:text="@{bow.restVerticalPosition}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showArrowRest}"
@@ -254,9 +254,9 @@
                             android:inputType="textNoSuggestions"
                             android:text="@{bow.restHorizontalPosition}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:propertyShouldShow="@{bow.type.showArrowRest}"
@@ -271,7 +271,7 @@
                             android:inputType="textNoSuggestions"
                             android:text="@{bow.restStiffness}"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
@@ -288,7 +288,7 @@
                     android:contentDescription="@string/bow_cam_settings"
                     app:srcCompat="@drawable/ic_bow_cam_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/cam"
@@ -298,7 +298,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.camSetting}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -313,7 +313,7 @@
                     android:contentDescription="@string/tiller"
                     app:srcCompat="@drawable/ic_bow_tiller_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/tiller"
@@ -323,7 +323,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.tiller}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -338,7 +338,7 @@
                     android:contentDescription="@string/height"
                     app:srcCompat="@drawable/ic_bow_brace_height_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/braceHeight"
@@ -348,7 +348,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.braceHeight}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -363,7 +363,7 @@
                     android:contentDescription="@string/limbs"
                     app:srcCompat="@drawable/ic_bow_limb_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/limbs"
@@ -373,7 +373,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.limbs}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -388,7 +388,7 @@
                     android:contentDescription="@string/sight"
                     app:srcCompat="@drawable/ic_bow_sight_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/sight"
@@ -398,7 +398,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.sight}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -413,7 +413,7 @@
                     android:contentDescription="@string/bow_scope_magnification"
                     app:srcCompat="@drawable/ic_bow_scope_magnification_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/scopeMagnification"
@@ -423,7 +423,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.scopeMagnification}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -438,7 +438,7 @@
                     android:contentDescription="@string/stabilizer"
                     app:srcCompat="@drawable/ic_bow_stabilizer_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/stabilizer"
@@ -448,7 +448,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.stabilizer}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -463,7 +463,7 @@
                     android:contentDescription="@string/clicker"
                     app:srcCompat="@drawable/ic_bow_clicker_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/clicker"
@@ -473,7 +473,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.clicker}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -488,7 +488,7 @@
                     android:contentDescription="@string/bow_nocking_point"
                     app:srcCompat="@drawable/ic_bow_nocking_point_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/nockingPoint"
@@ -498,7 +498,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.nockingPoint}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -513,7 +513,7 @@
                     android:contentDescription="@string/bow_string"
                     app:srcCompat="@drawable/ic_bow_string_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/string"
@@ -523,7 +523,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.string}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -538,7 +538,7 @@
                     android:contentDescription="@string/bow_button"
                     app:srcCompat="@drawable/ic_bow_button_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/button"
@@ -548,7 +548,7 @@
                         android:inputType="textNoSuggestions"
                         android:text="@{bow.button}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -563,7 +563,7 @@
                     android:contentDescription="@string/description"
                     app:srcCompat="@drawable/ic_comment_grey600_24dp"/>
 
-                <android.support.design.widget.TextInputLayout style="@style/propertyTextInputLayout">
+                <com.google.android.material.textfield.TextInputLayout style="@style/propertyTextInputLayout">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/description"
@@ -573,7 +573,7 @@
                         android:inputType="textMultiLine"
                         android:text="@{bow.description}"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </FrameLayout>
 
@@ -600,7 +600,7 @@
                 android:padding="16dp"
                 android:text="@string/sight_settings"/>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/sightMarks"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_edit_image.xml b/app/src/main/res/layout/fragment_edit_image.xml
index 7ff40ebd0..60aa27987 100644
--- a/app/src/main/res/layout/fragment_edit_image.xml
+++ b/app/src/main/res/layout/fragment_edit_image.xml
@@ -24,7 +24,7 @@
         android:transitionName="@string/transition_root_view"
         tools:targetApi="lollipop">
 
-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinatorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -36,13 +36,13 @@
             android:layout_alignParentTop="true"
             android:orientation="vertical">
 
-            <android.support.design.widget.AppBarLayout
+            <com.google.android.material.appbar.AppBarLayout
                 android:id="@+id/appBarLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-                <android.support.design.widget.CollapsingToolbarLayout
+                <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:id="@+id/collapsing_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -58,26 +58,26 @@
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"/>
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
                         app:layout_collapseMode="pin"
                         app:popupTheme="@style/Theme.AppCompat.Light.DarkActionBar"/>
 
-                </android.support.design.widget.CollapsingToolbarLayout>
+                </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-            </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/fab"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
                 app:layout_anchorGravity="bottom|right|end"
                 app:srcCompat="@drawable/ic_photo_camera_white_24dp"/>
 
-        </android.support.design.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_edit_round.xml b/app/src/main/res/layout/fragment_edit_round.xml
index 17e692502..1bc662fc2 100644
--- a/app/src/main/res/layout/fragment_edit_round.xml
+++ b/app/src/main/res/layout/fragment_edit_round.xml
@@ -25,7 +25,7 @@
         android:transitionName="@string/transition_root_view"
         tools:targetApi="lollipop">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/fragment_edit_standard_round.xml b/app/src/main/res/layout/fragment_edit_standard_round.xml
index fc54244ca..0e3b649bb 100644
--- a/app/src/main/res/layout/fragment_edit_standard_round.xml
+++ b/app/src/main/res/layout/fragment_edit_standard_round.xml
@@ -25,7 +25,7 @@
         android:transitionName="@string/transition_root_view"
         tools:targetApi="lollipop">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -33,7 +33,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
@@ -65,7 +65,7 @@
                             android:hint="@string/name"
                             android:inputType="textNoSuggestions"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                     <ImageButton
                         android:id="@+id/deleteStandardRound"
@@ -86,7 +86,7 @@
                     android:layout_height="1dp"
                     android:background="@color/dividerColor"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rounds"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_edit_training.xml b/app/src/main/res/layout/fragment_edit_training.xml
index 0648805ab..4cb4bb461 100644
--- a/app/src/main/res/layout/fragment_edit_training.xml
+++ b/app/src/main/res/layout/fragment_edit_training.xml
@@ -25,7 +25,7 @@
         android:transitionName="@string/transition_root_view"
         tools:targetApi="lollipop">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -33,7 +33,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorPrimary"
@@ -49,7 +49,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginStart="72dp">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/training_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
                         android:hint="@string/title"
                         android:inputType="text"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <Button
                     android:id="@+id/trainingDate"
@@ -80,7 +80,7 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
         <ScrollView
             android:id="@+id/scrollView"
diff --git a/app/src/main/res/layout/fragment_environment.xml b/app/src/main/res/layout/fragment_environment.xml
index 8faca2ec5..168d6d0ed 100644
--- a/app/src/main/res/layout/fragment_environment.xml
+++ b/app/src/main/res/layout/fragment_environment.xml
@@ -21,7 +21,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -29,7 +29,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorPrimary"
@@ -45,7 +45,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginStart="72dp">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/training_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -57,11 +57,11 @@
                         android:hint="@string/location"
                         android:inputType="text"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </RelativeLayout>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
         <LinearLayout
             android:id="@+id/indoorPlaceholder"
@@ -87,7 +87,7 @@
                 android:textSize="20sp"/>
         </LinearLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:id="@+id/weatherLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -181,7 +181,7 @@
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index 2037b72b8..ba4b3a123 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -17,18 +17,18 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             style="@style/card_list"
             app:layoutManager="LinearLayoutManager"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -38,6 +38,6 @@
             android:transitionName="@string/transition_root_view"
             tools:targetApi="lollipop"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 0ea7fc284..1a62dbb3a 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.xml
@@ -16,7 +16,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -92,7 +92,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/arrows"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -100,6 +100,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_target_select.xml b/app/src/main/res/layout/fragment_target_select.xml
index 38b3a0c30..5f70ac7f0 100644
--- a/app/src/main/res/layout/fragment_target_select.xml
+++ b/app/src/main/res/layout/fragment_target_select.xml
@@ -22,7 +22,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
@@ -70,9 +70,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             style="@style/card_list"
             app:layoutManager="LinearLayoutManager"/>
diff --git a/app/src/main/res/layout/fragment_timer.xml b/app/src/main/res/layout/fragment_timer.xml
index 94f22bc11..07cdf4b01 100644
--- a/app/src/main/res/layout/fragment_timer.xml
+++ b/app/src/main/res/layout/fragment_timer.xml
@@ -21,7 +21,7 @@
         android:layout_height="match_parent"
         android:background="@color/timer_red">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
@@ -40,7 +40,7 @@
                 android:textSize="20sp"
                 android:textStyle="bold"/>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
         <TextView
             android:id="@+id/timer_time"
diff --git a/app/src/main/res/layout/fragment_training.xml b/app/src/main/res/layout/fragment_training.xml
index 581425932..1447d74f9 100644
--- a/app/src/main/res/layout/fragment_training.xml
+++ b/app/src/main/res/layout/fragment_training.xml
@@ -17,7 +17,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -27,7 +27,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -36,7 +36,7 @@
                 app:layout_collapseMode="none"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/colorPrimary"
@@ -69,19 +69,19 @@
 
                 </FrameLayout>
 
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
-            <android.support.design.widget.CoordinatorLayout
+            <androidx.coordinatorlayout.widget.CoordinatorLayout
                 android:id="@+id/coordinatorLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView"
                     style="@style/card_list"
                     app:layoutManager="LinearLayoutManager"/>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/fab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -89,10 +89,10 @@
                     android:layout_margin="16dp"
                     android:src="@drawable/fab_add_white_24dp"/>
 
-            </android.support.design.widget.CoordinatorLayout>
+            </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
         </LinearLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_trainings.xml b/app/src/main/res/layout/fragment_trainings.xml
index de6b5389c..d5a3f5fbe 100644
--- a/app/src/main/res/layout/fragment_trainings.xml
+++ b/app/src/main/res/layout/fragment_trainings.xml
@@ -16,12 +16,12 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             style="@style/card_list"
             app:layoutManager="LinearLayoutManager"/>
@@ -41,6 +41,6 @@
             app:fabMenu="@menu/fab_trainings"
             app:miniFabBackgroundTintList="@array/fab_menu_trainings_colors"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/layout_switch_label.xml b/app/src/main/res/layout/layout_switch_label.xml
index a242aa961..c50f0e03d 100644
--- a/app/src/main/res/layout/layout_switch_label.xml
+++ b/app/src/main/res/layout/layout_switch_label.xml
@@ -19,7 +19,7 @@
               android:layout_height="wrap_content"
               android:orientation="horizontal">
 
-    <android.support.v7.widget.SwitchCompat
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/action_switch_control"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index 26ac9dd49..261a4598e 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -22,6 +22,6 @@
         android:title="@string/search"
         android:icon="@drawable/ic_search_white_24dp"
         app:showAsAction="collapseActionView|ifRoom"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
diff --git a/app/src/main/res/menu/settings_backup.xml b/app/src/main/res/menu/settings_backup.xml
index 32f2a9b53..44b3b9e93 100644
--- a/app/src/main/res/menu/settings_backup.xml
+++ b/app/src/main/res/menu/settings_backup.xml
@@ -22,4 +22,9 @@
         android:title="@string/import_action"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/action_fix_db"
+        android:title="@string/fix_db"
+        app:showAsAction="never"/>
+
 </menu>
diff --git a/app/src/main/res/raw-et-rEE/help.html b/app/src/main/res/raw-et-rEE/help.html
index e92e3bdac..a79edf27e 100644
--- a/app/src/main/res/raw-et-rEE/help.html
+++ b/app/src/main/res/raw-et-rEE/help.html
@@ -26,7 +26,7 @@ <h1>Get started with MyTargets</h1>
            
             <section> 
                 <h2>Organize trainings</h2>
-                <p>A training is organized into one or multiple rounds. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
+                <p>Koolitus koosneb ühest või mitmest voorust. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
                 <details>
                     <summary>Create a training</summary>
                     <p>To create a new training tap the orange circle at the bottom of the trainings page. Now you can select out of:</p>
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. Parimate näitajatega nooled asuvad loendi ülaosas. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-fr-rFR/help.html b/app/src/main/res/raw-fr-rFR/help.html
index 3ec99c504..7a6d5ae3e 100644
--- a/app/src/main/res/raw-fr-rFR/help.html
+++ b/app/src/main/res/raw-fr-rFR/help.html
@@ -26,10 +26,10 @@ <h1>Démarrer avec MyTargets</h1>
            
             <section> 
                 <h2>Organiser des entraînements</h2>
-                <p>A training is organized into one or multiple rounds. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
+                <p>Un entraînement se constitue d'une ou de plusieurs séries. Vous pouvez tirer autant de volées que vous voulez dans chaque série, et chaque volée contient jusqu'à un nombre prédéfini de flèches.</p>
                 <details>
                     <summary>Créer un entrainement</summary>
-                    <p>To create a new training tap the orange circle at the bottom of the trainings page. Now you can select out of:</p>
+                    <p>Pour créer un nouvel entraînement, tapez sur le cercle orange en bas de la page des entrainements. Ici vous aurez le choix entre :</p>
                     <ul>
                         <li><strong>Entraînement libre</strong> : Permet de régler librement la distance, le type et le diamètre de la cible ainsi que le nombre de flèches que vous voulez tirer par extrémité.</li>
                         <li><strong>Training with Standard Round</strong>: Allows you to select from a huge number of common standard rounds. You can also define your own if none of the predefined ones fits your needs.</li>
diff --git a/app/src/main/res/raw-hu-rHU/help.html b/app/src/main/res/raw-hu-rHU/help.html
index 62fc94ff9..d9e80e545 100644
--- a/app/src/main/res/raw-hu-rHU/help.html
+++ b/app/src/main/res/raw-hu-rHU/help.html
@@ -98,7 +98,7 @@ <h2>Statisztika</h2>
                     <p>In the following the main UI components are described:</p>
                     <ul>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
-                        <li><strong>Szóráskép</strong>: megmutatja a nyílvesszők eloszlását a találati körök területén. Nincs metszet kijelölés, akkor teljes találat számláló nem jelenik meg. By tapping on a segment the exact number of shots in this category is shown.</li>
+                        <li><strong>Találati aránydiagram</strong>: megmutatja a találatok eloszlását az érték körök területén. Nincs metszet kijelölés, akkor teljes találat számláló nem jelenik meg. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
                         <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. A legjobb átlagos pontszámú vesszők a lista elejére kerülnek. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
diff --git a/app/src/main/res/raw-ko-rKR/help.html b/app/src/main/res/raw-ko-rKR/help.html
index e92e3bdac..da2c56e0d 100644
--- a/app/src/main/res/raw-ko-rKR/help.html
+++ b/app/src/main/res/raw-ko-rKR/help.html
@@ -21,18 +21,18 @@
     </head>
     <body>
         <main>
-            <h1>Get started with MyTargets</h1>
+            <h1>MyTargets 시작</h1>
             <p>MyTargets allows you to record all results of you archery training rendering pen and paper obsolete. MyTargets is divided into three main categories: Trainings, bows and arrows. Trainings contains all the information you have collected during your training sessions. The bows section is the place to document your equipment properties and settings e.g. your sight marks. And the arrows section contains information about different arrow types.</p>
            
             <section> 
                 <h2>Organize trainings</h2>
-                <p>A training is organized into one or multiple rounds. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
+                <p>훈련은 하나 또는 여러 개의 라운드로 구성 됩니다. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
                 <details>
                     <summary>Create a training</summary>
-                    <p>To create a new training tap the orange circle at the bottom of the trainings page. Now you can select out of:</p>
+                    <p>훈련 교육 페이지의 하단에 주황색 동그라미를 눌러 새로운 훈련 탭을 만드세요 Now you can select out of:</p>
                     <ul>
                         <li><strong>Free Training</strong>: Allows you to freely set distance, target face type and diameter as well as the number of arrows you want to shot per end.</li>
-                        <li><strong>Training with Standard Round</strong>: Allows you to select from a huge number of common standard rounds. You can also define your own if none of the predefined ones fits your needs.</li>
+                        <li><strong>표준 라운드와 교육</strong>: 엄청난 수의 일반적인 표준 라운드에서 선택할 수 있습니다. You can also define your own if none of the predefined ones fits your needs.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ru-rRU/help.html b/app/src/main/res/raw-ru-rRU/help.html
index 56c206830..b786c90c8 100644
--- a/app/src/main/res/raw-ru-rRU/help.html
+++ b/app/src/main/res/raw-ru-rRU/help.html
@@ -26,17 +26,17 @@ <h1>Начало работы с MyTargets</h1>
            
             <section> 
                 <h2>Организация тренировок</h2>
-                <p>Тренировка состоит из одного или нескольких раундов. Каждый раунд может содержать произвольное количество серий, в свою очередь, серия содержит определенное количество выстрелов.</p>
+                <p>Тренировка состоит из одного или нескольких раундов. Каждый раунд может содержать произвольное количество серий, которые, в свою очередь, состоят из заранее определённого количество выстрелов.</p>
                 <details>
                     <summary>Создать тренировку</summary>
-                    <p>Для создания новой тренировки, нажмите на оранжевый круг в нижней части страницы тренировок. Теперь вы можете выбрать из:</p>
+                    <p>Для создания новой тренировки нажмите на оранжевый круг в нижней части страницы. Теперь вы можете выбрать из:</p>
                     <ul>
                         <li><strong>Свободная тренировка</strong>: позволяет вам самостоятельно установить расстояние, вид и диаметр мишени, а также количество стрел в серии.</li>
-                        <li><strong>Тренировка со стандартным раундом</strong>: позволяет вам выбрать из огромного числа общих стандартных раундов. Можно также определить собственные, если ни один из предложенных не соответствует вашим потребностям.</li>
+                        <li><strong>Тренировка со стандартным раундом</strong>: позволяет вам выбрать из огромного числа общих стандартных раундов. Можно также определить собственные параметры, если ни один из предопределённых не подошёл.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Выберите вид мишени</summary>
+                    <summary>Выбор вида мишени</summary>
                     <p>Вы можете выбрать из целого ряда мишеней (3). Некоторые мишени имеют разные <strong>стили учета попаданий </strong> (1). Стили учета попаданий представляют результаты в соответствии с участком попадания стрелы в мишень. Диаметр мишени может быть определён в ручную. </p>
                     <img src="images/target_face_selection.png" />
                     <p><strong>Примечание:</strong> Диаметр круга мишени зависит от общего размера всей мишени. К примеру: кольцо 5 WA в приложении представлено диаметром 80 см, хотя в реальной жизни имеет диаметр только 40 см, потому что полный размер WA мишени будет иметь диаметр 80 см.</p>
@@ -45,79 +45,79 @@ <h2>Организация тренировок</h2>
                     <summary>WA стиль</summary>
                     <p>Далее все WA стили, описаны более детально:</p>
                     <ul>
-                        <li><strong>Классический стиль (X-1)</strong>: внутреннее "Золотое кольцо" засчитывается за 10 очков, но помечено как X. Внешние кольца оцениваются как 10 и 9 соответственно. Значение уменьшается на 1 с каждым кольцом. Оценка уменьшается на 1 с каждым кольцом.</li>
-                        <li><strong>Классический стиль (10 - 1)</strong>: так же, как и предыдущий, но 2 внутренних золотых кольца показаны как одно кольцо, оцениваются в 10 баллов (без X).</li>
-                        <li><strong>Блочный стиль</strong>: только внутреннее золотое кольцо засчитывается за 10 очков. Два внешних золотых кольца засчитываются как один и оцениваются в 9 очков.</li>
-                        <li><strong>11, 10, 9,..., 1</strong>: внутреннее кольцо засчитывается за 11 очков. Результат уменьшается на 1 с каждым кольцом.</li>
-                        <li><strong>9, 7, 5, 3, 1</strong>: Золотые кольца - 5 очков, красные - 4, синие - 3, черные - 2 и белые - 1 очко. Внутреннее золотое кольцо засчитывается как X.</li>
+                        <li><strong>Классический стиль (X-1)</strong>: внутреннее "Золотое кольцо" засчитывается за 10 очков, но помечено как X. Внешние кольца оцениваются как 10 и 9 соответственно. Значение уменьшается на 1 с каждым кольцом.</li>
+                        <li><strong>Классический стиль (10 - 1)</strong>: такой же, как и предыдущий, но 2 внутренних золотых кольца показаны как одно кольцо, оцениваются в 10 баллов (без X).</li>
+                        <li><strong>Блочный стиль</strong>: только внутреннее золотое кольцо оценивается в 10 очков. Внешние два золотых кольца показываются как одно и оцениваются в 9 очков.</li>
+                        <li><strong>11, 10, 9,..., 1</strong>: внутреннее кольцо оценивается в 11 очков. Значение уменьшается на 1 с каждым кольцом.</li>
+                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Золотые кольца дают 5 очков, красные - 4, синие - 3, черные - 2 и белые - 1 очко. Внутреннее золотое кольцо записывается как X.</li>
                         <li><strong>9, 7, 5, 3, 1</strong>: Золотые кольца - 9 очков, красные - 7, синие -5, черные - 3 и белые - 1 очко.</li>
-                        <li><strong>FCFS цветной (обратный 10 - 1)</strong>: запись результатов попаданий в обратном стиле, где белые кольца дают - 10, черные - 8, синие - 6, красные - 4, наружное золотое - 2 и два внутренних золотых - 1 очко. Обычно, серия состоит из 6 выстрелов. Только одна стрела засчитывается за "цветное" попадание. Максимально возможный результат за серию - 31 очков, при этом все стрелы попали в различные цвета.</li>
+                        <li><strong>FCFS цветной (обратный 10 - 1)</strong>: запись результатов попаданий в обратном стиле, где белые кольца дают - 10, черные - 8, синие - 6, красные - 4, наружное золотое - 2 и два внутренних золотых - 1 очко. Обычно, серия состоит из 6 выстрелов. Только одна стрела засчитывается за "цветное" попадание. Максимально возможный результат за серию - 31 очко, при этом все стрелы попали в различные цвета.</li>
                     </ul>
                 </details>
                 <details>
                     <summary>Номера стрел</summary>
-                    <p>Помимо записи общих результатов попаданий в конкретной тренировке Вы также можете учитывать отдельные выстрелы по номерам стрел. Вы можете анализировать поведение стрелы за время тренировки. При создании новой тренировки, необходимо включить этот параметр в настройках:</p>
+                    <p>Помимо записи общих результатов попаданий, в конкретной тренировке, Вы также можете учитывать отдельные выстрелы по номерам стрел. Вы можете анализировать поведение стрелы за время тренировки. При создании новой тренировки, необходимо включить этот параметр в настройках:</p>
                     <img src="images/arrow_numbers.png" />
                 </details>
                 <details>
                     <summary>Что такое стандартный раунд?</summary>
-                    <p>Стандартный раунд является шаблоном стандартных тренировок, в котором указано точное количество раундов, серий и выстрелов в серии. Кроме того расстояния и вид мишени фиксированы.</p>
-                    <p>Приложение предоставляет Вам целый ряд наиболее распространенных стандартных раундов.</p>
+                    <p>"Стандартный раунд" является шаблоном стандартных тренировок, в котором указано точное количество раундов, серий и выстрелов в серии. Кроме того, расстояния и вид мишени фиксированы.</p>
+                    <p>Приложение предоставляет Вам целый ряд наиболее распространённых стандартных раундов.</p>
                 </details>
                 <details>
                     <summary>Как изменить вид мишени для стандартного раунда?</summary>
-                    <p>Стандартный раунд определяет только используемый тип мишени, но не конкретный вид мишени. Так что вы можете настроить вид мишени, такой, которую вы фактически используете. Просто нажмите на «Изменить вид мишени» на экране настроек стандартного раунда.</p>
+                    <p>Стандартный раунд определяет только используемый тип мишени, но не конкретный вид мишени. Так что вы можете настроить вид мишени, такой, какую вы фактически используете. Просто нажмите на «Изменить вид мишени» на экране настроек стандартного раунда.</p>
                     <img src="images/change_target_face.png" />
                 </details>
             </section>
             <section> 
                 <h2>Ввод данных</h2>
-                <p>MyTargets поддерживает режим точного ввода позиции попадания стрелы в мишени и режим ввода на основе клавиатуры. Переключение между ними возможно через настройки.</p>
+                <p>MyTargets поддерживает режим ввода с точным позиционированием попадания стрелы в мишень и режим ввода значения попаданий с клавиатуры. Переключение между ними возможно через настройки.</p>
                 <details>
                     <summary>Точное позиционирование стрелы</summary>
-                    <p>Режим точного ввода позиции стрелы является метод ввода по умолчанию. Данный метод является методом ввода по умолчанию. Чтобы ввести значение выстрела нажмите и удерживайте палец на изображении мишени. Перемещая по экрану можете менять положение до тех пор, пока вы не удовлетворяетесь позицией стрелы. Затем отпустите палец.</p>
+                    <p>Данный метод является методом ввода по умолчанию. Чтобы ввести значение выстрела нажмите и удерживайте палец на изображении мишени. Перемещая по экрану, вы можете менять положение до тех пор, пока не удовлетворитесь позицией стрелы. Затем отпустите палец.</p>
                     <img src="images/input_plotting.png"/>
                     <p><strong>Примечание:</strong> Обнаружение скольжения пальца по экрану распознается как непреднамеренное движение и игнорируется.</p>
                 </details>
                 <details>
                     <summary>Режим ввода с клавиатуры</summary>
-                    <p>Режим клавиатуры, является альтернативой метода по умолчанию. В режиме клавиатуры вы можете ввести только только в которое попала стрела, но её точное местонахождение.</p>
+                    <p>Режим клавиатуры, является альтернативным методом ввода попаданий. В данном режиме можно ввести только числовое значение кольца мишени, куда попала стрела, но не её точное местонахождение.</p>
                     <img src="images/input_keyboard.png"/>
                     <p>Параметр "левша" переносит расположение клавиатуры на левую сторону экрана, чтобы сделать возможным введение данных одной рукой.</p>
                 </details>
                 <details>
                     <summary>Редактирование и удаление выстрелов</summary>
-                    <p>Для редактирования уже введенных выстрелов, просто нажмите на кружек обозначающий нужный выстрел на панели результатов, затем измените выстрел, как вам нравится. Чтобы удалить последний выстрел, введенный вами нажмите клавишу backspace в верхней части экрана ввода.</p>
+                    <p>Для редактирования уже введённых выстрелов, просто нажмите на кружёк обозначающий нужный выстрел на панели результатов, затем измените выстрел, как вам нравится. Чтобы удалить последний выстрел, введённый вами, нажмите клавишу backspace в верхней части экрана ввода.</p>
                 </details>
             </section>
             <section> 
                 <h2>Статистика</h2>
-                <p>Статистические данные позволяют получить сводное представление о данных ваших тренировок.</p>
+                <p>Статистические данные позволяют получить сводное представление о ваших тренировках.</p>
                 <details>
                     <summary>Элементы статистики</summary>
                     <p>Ниже описаны основные компоненты пользовательского интерфейса:</p>
                     <ul>
-                        <li><strong>Линейный график</strong>: показывает средний балл стрелы за серию. Оранжевая линия линейной регрессии показывает общую тенденцию. Диаграмма может быть увеличено путем сжимать пальцами по горизонтали.</li>
-                        <li><strong>Диаграмма распределения</strong>: показывает распределение результатов попаданий в определенные кольца по отношению к общему результату. Если определенный сегмент не выбран, показывается общее количество попаданий в мишень и промахов. При выборе сегмента, будет показано количество попаданий стрел в это кольцо за тренировку.</li>
-                        <li><strong>Дисперсия</strong>: показывает все выстрелы на одной мишени, и поле разброса значений, согласно выбранного метода группировки (может быть изменен в настройках приложения). При нажатии на изображение вы получите увеличенную версию экрана дисперсии. На экране детализации вы можете поделиться данным изображением или распечатать его.</li>
-                        <li><strong>Рейтинг стрел</strong>: Если вы использовали функцию нумерации стрел в одной из выбранных тренировок, стрелы будут распределены по рейтингу попаданий и показаны ниже. Стрелы с лучших показателями находятся в верхней части списка. Нажатие на номер стрелы переведет вас к экрану детализации, на котором будут отображены выбранные выстрелы.</li>
+                        <li><strong>Линейный график</strong>: показывает средний балл по стреле за серию. Оранжевая линия линейной регрессии показывает общую тенденцию. Масштаб диаграммы может быть увеличен путем сжатия пальцами по горизонтали.</li>
+                        <li><strong>Диаграмма распределения</strong>: показывает распределение результатов попаданий в определенные кольца по отношению к общему результату. Если определённый сегмент не выбран, показывается общее количество попаданий в мишень и промахов. При выборе сегмента, будет показано количество попаданий стрел в это кольцо за тренировку.</li>
+                        <li><strong>Дисперсия</strong>: показывает все выстрелы на одной мишени, и поле разброса значений, согласно выбранного метода группировки (может быть изменён в настройках приложения). При нажатии на изображение вы получите увеличенную версию экрана дисперсии. На экране детализации вы можете поделиться данным изображением или распечатать его.</li>
+                        <li><strong>Рейтинг стрел</strong>: Если вы использовали функцию нумерации стрел в одной из выбранных тренировок, стрелы будут распределены по рейтингу попаданий и показаны ниже. Стрелы с лучшими показателями находятся в верхней части списка. Нажатие на номер стрелы перенесёт вас на экран детализации, на котором будут отображены выбранные выстрелы.</li>
                     </ul>
                 </details>
                 <details>
                     <summary>Область анализа</summary>
                     <p>Область, анализируемая в статистике зависит от экрана, из которого вы её открыли. При запуске статистики из основного экрана будут учитываться все имеющиеся данные тренировок. При запуске статистики из экрана конкретной тренировки или раунда данные будут учитываться обособленно.</p>
                     <img src="images/statistics_icon.png" style="width:10%;"/>
-                    <p>Можно также использовать множественный выбор например выбрать две или несколько тренировок (раундов).</p>
+                    <p>Можно также использовать множественный выбор, например, выбрать две или несколько тренировок (раундов).</p>
                     <img src="images/statistics_multiselect.png"/>
                 </details>
                 <details>
                     <summary>Применение фильтров</summary>
-                    <p>Вы также можете применять фильтры для введенных данных. Фильтрация возможна по луку, стрела, расстоянию и диаметру мишени.</p>
+                    <p>Вы также можете применять фильтры для введённых данных. Фильтрация возможна по луку, стрелам, расстоянию или диаметру мишени.</p>
                     <img src="images/statistics_filter.png" style="width:10%;"/>
                 </details>
                 <details>
                     <summary>Экспорт данных</summary>
-                    <p>Можно экспортировать выбранные данные в файл *.csv, который может быть открыт в приложении электронных таблиц, таких как Microsoft Excel. Колонки X и Y описывают координаты попадания стрелы, относительно точки отсчета. Точкой отсчета (0, 0) является центр мишени, внешняя граница мишени - 1.</p>
+                    <p>Можно экспортировать выбранные данные в файл *.csv, который может быть открыт в приложении электронных таблиц, таких как Microsoft Excel. Колонки X и Y описывают координаты попадания стрелы, относительно точки отсчёта. Точкой отсчёта (0, 0) является центр мишени, внешняя граница мишени - 1.</p>
                     <img src="images/statistics_export.png" style="width:10%;"/>
                     <p><strong>Примечание</strong>: вы можете <strong>не</strong> импортировать данные тренировок в приложение. Чтобы создать резервную копию ваших данных вы должны использовать резервное копирование, позже можно восстановить функциональность в настройках.</p>
                 </details>
@@ -127,11 +127,11 @@ <h2>Всякая всячина</h2>
                 <p></p>
                 <details>
                     <summary>Почему попадания от мои стрел в мишени изображаются такими маленькими?</summary>
-                    <p>Размер точки попадания стрелы определяется по диаметру, указанному в настройках, в свойствах стрелы как и диаметр выбранной мишени. Размер точки попадания стрелы рисуется в «реальный» размер. Если вы не хотите чтобы размер точки попадания стрелы, был представлен в реальном размере, вы можете изменить его в ручную. Для этого перейдите в "Настройки" > "Ввод" > "Шкала диаметров стрел" и установите удобный размер. В случае, если вы просто хотите видеть стрелу в большем увеличении во время введения данных о попадании, вы можете настроить необходимый масштаб мишени.</p>
+                    <p>Размер точки попадания стрелы определяется по диаметру, указанному в настройках, в свойствах стрелы, как и диаметр выбранной мишени. Размер точки попадания стрелы рисуется в «реальном» размер. Если вы не хотите чтобы размер точки попадания стрелы, был представлен в реальном размере, вы можете изменить его в ручную. Для этого перейдите в "Настройки" > "Ввод" > "Шкала диаметров стрел" и установите удобный размер. В случае, если вы просто хотите видеть стрелу в большем увеличении, во время введения данных о попадании, вы можете настроить необходимый масштаб мишени.</p>
                 </details>
                 <details>
                     <summary>Где хранятся мои резервные копии данных на Google диске?</summary>
-                    <p>Резервные копии приложения хранятся в папке данных приложения на Google диске. Файлы, хранящиеся там, доступны только в приложении, в котором они созданы. Таким образом вы можете видеть резервные копии только изнутри приложения MyTargets. Кроме того, Webapp Google диска позволяет удалить все данные резервного копирования (параметры > управлять Apps). Когда вы установите приложение на другом устройстве и войдете в аккаунт Google вы получите доступ ко всем вашим резервным копиям.</p>
+                    <p>Резервные копии приложения хранятся в папке данных приложения на Google диске. Файлы, хранящиеся там, доступны только в приложении, в котором они созданы. Таким образом, вы можете видеть резервные копии только из приложения MyTargets. Кроме того, Webapp Google диска позволяет удалить все данные резервного копирования (параметры > управлять Apps). Когда вы установите приложение на другом устройстве и войдёте в аккаунт Google вы получите доступ ко всем вашим резервным копиям.</p>
                 </details>
             </section>
         </main>
diff --git a/app/src/main/res/raw-sk-rSK/help.html b/app/src/main/res/raw-sk-rSK/help.html
index ee829dc29..9db2e1438 100644
--- a/app/src/main/res/raw-sk-rSK/help.html
+++ b/app/src/main/res/raw-sk-rSK/help.html
@@ -22,7 +22,7 @@
     <body>
         <main>
             <h1>Začíname s MyTargets</h1>
-            <p>MyTargets allows you to record all results of you archery training rendering pen and paper obsolete. MyTargets is divided into three main categories: Trainings, bows and arrows. Trainings contains all the information you have collected during your training sessions. The bows section is the place to document your equipment properties and settings e.g. your sight marks. And the arrows section contains information about different arrow types.</p>
+            <p>MyTargets vám pomôže zaznamenať všetky výsledky tréningov lukostreľby bez pera a papiera. MyTargets je rozdelená do troch hlavných kategórií: tréningy, luky a šípy. Tréningy obsahuje všetky informácie, ktoré ste získali počas svojich tréningov. V záložke luky môžete zadať vlastnosti a nastavenia vášho vybavenia napr. zameriavacie body. Záložka šípov obsahuje informácie o rôznych typoch šípov.</p>
            
             <section> 
                 <h2>Organizácia tréningov</h2>
@@ -31,107 +31,107 @@ <h2>Organizácia tréningov</h2>
                     <summary>Vytvoriť tréning</summary>
                     <p>Pre vytvorenie nového tréningu ťuknite oranžový kruh v dolnej časti stránky tréningov. Teraz si môžete vybrať z:</p>
                     <ul>
-                        <li><strong>Voľný tréning</strong>: Umožňuje voľne nastaviť vzdialenosť, typ terča a priemer, rovnako ako počet šípov, ktoré chcete vystreliť za sadu.</li>
-                        <li><strong>Tréning s štandardným kolom</strong>: Umožňuje vybrať z obrovského množstva bežných štandardných kôl. Môžete si tiež nadefinovať svoje vlastné kolá, ak žiadne z preddefinovaných nevyhovuje vašim potrebám.</li>
+                        <li><strong>Voľný tréning</strong>: Umožňuje ľubovoľne nastaviť vzdialenosť, typ terča a priemer, rovnako ako počet šípov, ktoré chcete vystreliť za sadu.</li>
+                        <li><strong>Tréning so štandardným kolom</strong>: Umožňuje vybrať z obrovského množstva bežných štandardných kôl. Môžete si tiež zadefinovať svoje vlastné kolá, ak žiadne z preddefinovaných nevyhovuje vašim potrebám.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Select a target face</summary>
-                    <p>You can select from a variety of target faces (3). Some target faces do have different <strong>scoring styles</strong> (1). The scoring style describes the score associated with a particular area of the target face. Additionally the diameter of the target face can be specified (2). </p>
+                    <summary>Vyberte typ terča</summary>
+                    <p>Môžete vybrať z množstva rôznych typov terčov (3). Niektoré typy terčov majú odlišné <strong>spôsoby bodovania</strong> (1). Spôsob bodovania popisuje skóre spojené s určitou oblasťou terča. Naviac môže byť určený priemer terča (2). </p>
                     <img src="images/target_face_selection.png" />
-                    <p><strong>Note: </strong>The diameter of a spot target face is relative to the target face of the full target. For example a WA 5 Ring Spot with 80cm diameter in the app represents a spot in that has actually only 40cm in real-life, because the full WA target face would have 80cm.</p>
+                    <p><strong>Poznámka:</strong> Priemer plochy bodu je relatívny k cieľovej ploche celého terča. Napríklad WA 5 kruhov s priemerom 80 cm v aplikácii predstavuje plochu, ktorá v skutočnosti má iba 40 cm, pretože celá plocha WA terča by mala 80 cm.</p>
                 </details>
                 <details>
-                    <summary>WA scoring styles</summary>
-                    <p>In the following all WA scoring styles are described in more detail:</p>
+                    <summary>WA spôsob terča</summary>
+                    <p>V nasledujúcom sú podrobnejšie popísané všetky bodovacie štýly WA:</p>
                     <ul>
-                        <li><strong>Recurve style (X-1)</strong>: The innermost golden ring scores 10 points, but is marked as X. The outer golden rings score 10 and 9 accordingly. The score decreases with every ring by 1.</li>
-                        <li><strong>Recurve style (10-1)</strong>: Same as previous, but the inner two golden rings are shown as one ring, rewarded with 10 points (no X).</li>
-                        <li><strong>Compound style</strong>: Only the innermost golden ring scores 10 points. The outermost two golden rings are shown as one and score 9 points.</li>
-                        <li><strong>11, 10, 9, ..., 1</strong>: The innermost ring scores 11. The score decreases with every ring by 1.</li>
-                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Gold scores 5, red 4, blue 3, black 2 and white 1 points. The innermost golden ring is recorded as X.</li>
-                        <li><strong>9, 7, 5, 3, 1</strong>: Gold scores 9, red 7, blue 5, black 3 and white 1 points.</li>
-                        <li><strong>FCFS Color (Reversed 10-1)</strong>: Play scoring style where white scores 10, black 8, blue 6, red 4, outer gold 2 and the inner two gold 1. Typically shot with 6 arrows per end. Only one arrow is counted per color. The maximum achievable score is 31 points per end, when every arrow is shot into a distinct color.</li>
+                        <li><strong>Reflexný štýl (X-1)</strong>: Najvnútornejší žltý kruh odpovedá 10-tim bodom, ale je označený ako X. Vonkajšie žlté kruhy odpovedajú 10-tim a 9-tim bodom. Skóre klesá s každým kruhom o 1.</li>
+                        <li><strong>Reflexný štýl (10-1)</strong>: Rovnaké ako predchádzajúce, ale vnútorné dva žlté kruhy sú zobrazené ako jeden kruh za 10 bodov (bez X).</li>
+                        <li><strong>Kladkový štýl:</strong> Iba najvnútornejší žltý kruh je za 10 bodov. Okolité dva žlté kruhy sú zobrazené ako jeden za 9 bodov.</li>
+                        <li><strong>11, 10, 9, ..., 1:</strong> Najvnútornejší žltý kruh je za 11 bodov. Skóre sa s každým kruhom znižuje o 1.</li>
+                        <li><strong>X, 5, 4, 3, 2, 1:</strong> Žltá skóre 5, červená 4, modrá 3, čierna 2 a biela 1 bod. Najvnútornejší žltý kruh je zapísaný ako X.</li>
+                        <li><strong>9, 7, 5, 3, 1</strong>: Žltá skóre 9, červená 7, modrá 5, čierna 3 a biela 1 bod.</li>
+                        <li><strong> FCFS Farby (opačne 10-1)</strong>: Hraje sa bodový štýl, kde biela je za 10 bodov, čierna 8, modrá 6, červená 4, vonkajšia žltá 2 a vnútorné dve žlté za 1 bod. Obvykle sa strieľa 6 šípov za sadu. Na jednu farbu sa počíta iba jeden šíp. Maximálne dosiahnuteľné skóre je 31 bodov na sadu, Ak každý šíp zasiahne inú farbu.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Arrow numbering</summary>
-                    <p>Besides documenting the arrows used in a particular training, you may also annotate individual shots with the number of the arrow. You can enable the behaviour on a per-training basis. When you create the training you have to set the option accordingly:</p>
+                    <summary>Číslovanie šípov</summary>
+                    <p>Okrem dokumentácie šípov použitých pri konkrétnom tréningu, môžete k jednotlivým výstrelom zapísať tiež poznámku s číslom šípu. Toto správanie môžete povoliť pri každom tréningu. Pri vytváraní tréningu to musíte nastaviť odpovedajúcim spôsobom:</p>
                     <img src="images/arrow_numbers.png" />
                 </details>
                 <details>
-                    <summary>What is a Standard Round?</summary>
-                    <p>A standard round is a predefined training template, which specified the exact number of rounds, ends and arrows shot per end. Additionally the distances and target faces are fixed.</p>
-                    <p>The app provides you with a variety of standard rounds that are commonly used.</p>
+                    <summary>Čo je štandardné kolo?</summary>
+                    <p>Štandardné kolo je prednastavená šablóna tréningu, ktorá špecifikuje presný počet kôl, sád a šípov vystrelených na sadu. Okrem toho sú vzdialenosti a terče fixné.</p>
+                    <p>Aplikácia vám ponúka radu štandardných kôl, ktoré sú bežne používané.</p>
                 </details>
                 <details>
-                    <summary>How to change the target face for a standard round?</summary>
-                    <p>A standard round defines only which type of target should be used, but not which exact target face. So you can adjust the target face to that one you actually use. Just tap on "Change target face" below the standard round.</p>
+                    <summary>Ako zmeniť typ terča pre štandardné kolo?</summary>
+                    <p>Štandardné kolo definuje iba to aká zostava má byť použitá ale nie presný typ terča. Takže môžete nastaviť typ terča na taký, ktorý skutočne používate. Stačí ťuknúť na "Zmeniť typ terča" pod štandardným kolom.</p>
                     <img src="images/change_target_face.png" />
                 </details>
             </section>
             <section> 
-                <h2>Input</h2>
-                <p>MyTargets supports an exact arrow plotting and a keyboard based input mode. Switching between them is possible via the settings.</p>
+                <h2>Vstup</h2>
+                <p>MyTargets podporuje presné zakreslenie umiestnenia šípu alebo zadávanie hodnôt pomocou čísel. Prepínanie medzi nimi je možné pomocou nastavení.</p>
                 <details>
-                    <summary>Exact arrow plotting</summary>
-                    <p>The exact arrow plotting is the default input method. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
+                    <summary>Presné zakreslenie šípu</summary>
+                    <p>Presné zakreslenie šípu je prednastavená metóda zadávania. Pre vloženie zásahu ťuknite a podržte palec na terči a upravujte pozíciu kým nie ste spokojný s pozíciou šípu a potom palec zodvihnite.</p>
                     <img src="images/input_plotting.png"/>
-                    <p><strong>Note: </strong>The finger slip detection will recognize unintended moves while releasing the finger and ignore them.</p>
+                    <p><strong>Poznámka:</strong> Detekcia sklzu prstu rozpozná neúmyselné pohyby pri uvoľnení prsta a bude ich ignorovať.</p>
                 </details>
                 <details>
-                    <summary>Keyboard mode</summary>
-                    <p>The keyboard mode as an alternative to the default detailed shot entry. In the keyboard mode you only enter the ring hit by the arrow and not its exact location.</p>
+                    <summary>Režim klávesnice</summary>
+                    <p>Režim klávesnice, je ako alternatíva k prednastavenému presnému zadávaniu pozície zásahov. V režime klávesnice zadávate iba hodnoty prstencov zasiahnuté šípom ale nie ich presnú pozíciu.</p>
                     <img src="images/input_keyboard.png"/>
-                    <p>The left-handed setting brings the keyboard to the left side to make selection with a single hand possible.</p>
+                    <p>Nastavenie ľavou rukou prenesie klávesnicu na ľavú stranu, aby bolo možné zadávať jednou rukou.</p>
                 </details>
                 <details>
-                    <summary>Editing and deleting shots</summary>
-                    <p>To edit an already entered shot just tap on the circle on the top that shows the respective shot, then change the shot as you like. To delete the last shot you have entered press the backspace key at the top of the input screen.</p>
+                    <summary>Úpravy a mazanie zásahov</summary>
+                    <p>Pokiaľ chcete upraviť už zadaný zásah, ťuknite na koliesko v hornej časti, ktoré zobrazuje príslušný zásah a potom ho zmeňte ako potrebujete. Pokiaľ chcete vymazať posledný zásah, ktorý ste zadali, stlačte tlačítko späť v hornej časti obrazovky.</p>
                 </details>
             </section>
             <section> 
-                <h2>Statistics</h2>
-                <p>The statistics allow you to get an aggregated view on your training data.</p>
+                <h2>Štatistiky</h2>
+                <p>Štatistiky vám umožňujú získať súhrnný prehľad o vašich tréningových údajoch.</p>
                 <details>
-                    <summary>Statistics elements</summary>
-                    <p>In the following the main UI components are described:</p>
+                    <summary>Prvky štatistiky</summary>
+                    <p>Nižšie sú popísane hlavné komponenty používateľského rozhrania:</p>
                     <ul>
-                        <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
-                        <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
-                        <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Líniový graf:</strong> Zobrazuje priemerné skóre šípov na sadu. Oranžové regresné čiary ukazujú celkový trend. Graf je možné zväčšiť dvoma prstami horizontálnym pohybom.</li>
+                        <li><strong>Distribučný graf:</strong> Ukazuje rozloženie šípov medzi dostupnými kruhmi. Ak nie je zvolený žiadny segment, zobrazí sa celkový počet zásahov a minutí. Ťuknutím na segment sa zobrazí presný počet zásahov v tejto skupine.</li>
+                        <li><strong>Rozptylový vzor:</strong> Zobrazuje všetky zásahy na jednom terči vrátane zvoleného spôsobu zoskupovania (je možné meniť v nastaveniach aplikácie). Pokiaľ ťuknete na rozptylový vzor, získate zväčšenie rozptylového vzoru. Z obrazovky podrobnosti môžete tiež obrázok rozptylového vzoru zdieľať alebo ho vytlačiť.</li>
+                        <li><strong>Hodnotenie šípu:</strong> Pokiaľ ste použili funkciu číslovania šípov v jednom z vybraných tréningov, hodnoty šípov budú zobrazené nižšie. Šípy s najlepším priemerným skóre sú umiestnené v hornej časti zoznamu. Ťuknutím na číslo šípu sa dostanete k rozptylovému vzoru, ktorý zobrazuje iba zásahy zvoleného šípu.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Analysis scope</summary>
-                    <p>The scope being analyzed in the statistics depends on the screen from which you open it. Invoked from the main screen all available training data is considered. In the training and round detail views the whole training or round is considered accoridingly.</p>
+                    <summary>Rozsah analýzy</summary>
+                    <p>Rozsah, ktorý sa analyzuje v štatistike závisí na obrazovke z ktorej ju otvoríte. Pri vyvolaní z hlavnej obrazovky sú dostupné všetky tréningové údaje. Pri pohľadoch tréningových alebo kolových sa adekvátne posudzuje celý tréning alebo konkrétne kolo.</p>
                     <img src="images/statistics_icon.png" style="width:10%;"/>
-                    <p>You can also use multi-selection to e.g. select two or more trainings.</p>
+                    <p>Môžete taktiež použiť viacnásobný-výber napr. vyberte dva alebo viac tréningov.</p>
                     <img src="images/statistics_multiselect.png"/>
                 </details>
                 <details>
-                    <summary>Applying filters</summary>
-                    <p>You can also apply filters to your selected training data. Filtering is possible by bow, arrow, distance and target diameter.</p>
+                    <summary>Použitie filtrov</summary>
+                    <p>Môžete taktiež použiť filtrovanie na vybrané údaje z tréningu. Filtrovanie je možné za luk, šípy, vzdialenosti a priemer terča.</p>
                     <img src="images/statistics_filter.png" style="width:10%;"/>
                 </details>
                 <details>
-                    <summary>Exporting data</summary>
-                    <p>You can export the selected data to a *.csv file, which can be opened in a spreadsheet application like Excel. The x and y columns describe the coordinates of the shots whereby the origin 0, 0 is the center of the target and the outer border of the target is 1 unit away.</p>
+                    <summary>Export údajov</summary>
+                    <p>Zvolené údaje môžete exportovať do súboru *.csv, ktorý je možné otvoriť v aplikácii tabuľkového procesoru, ako je Excel. Stĺpce x a y popisujú súradnice zásahu, pričom začiatok 0, 0 je stred terča a vonkajší okraj terča je vzdialený 1 jednotku.</p>
                     <img src="images/statistics_export.png" style="width:10%;"/>
-                    <p><strong>Note</strong>: You can <strong>not</strong> import training data into the app. To create a backup of your data you have to use the backup and restore functionality in the settings.</p>
+                    <p><strong>Poznámka: Nemôžete</strong> importovať dáta o tréningu do aplikácie. Pokiaľ si prajete vytvoriť zálohu dát, musíte v nastaveniach použiť funkciu zálohovanie a obnova.</p>
                 </details>
             </section>
             <section> 
-                <h2>Miscellaneous</h2>
+                <h2>Rôzne</h2>
                 <p></p>
                 <details>
-                    <summary>Why are my arrows drawn so small?</summary>
-                    <p>The size of the arrows is determined by the diameter specified in the arrow properties and the diameter of the selected target face. The arrow size is drawn in "real" size. If you do not want the arrows to be drawn in realistic sizes, you can scale the arrows artificially. Go to Settings > Input > Arrow diameter scale and adjust the scaling. In case you just want to have the arrow bigger, while placing the arrow on the target you can adjust the Target zoom level.</p>
+                    <summary>Prečo sú moje šípy také malé?</summary>
+                    <p>Veľkosť šípov sa určuje podľa priemeru špecifikovaného v nastaveniach vlastností šípu a priemeru zvoleného typu terča. Hrúbka šípu je vykresľovaná v "reálnej" veľkosti. Pokiaľ nechcete aby šípy boli zakresľované v reálnej veľkosti, môžete umelo zmeniť mierku šípov. Prejdite do ponuky Nastavenia> Vstup> Škála priemeru šípu a upravte mierku. V prípade, že chcete mať väčší šíp počas doby umiestňovania šípu na terč, môžete si upraviť úroveň zväčšenia terča.</p>
                 </details>
                 <details>
-                    <summary>Where are my backups saved in Google drive?</summary>
-                    <p>Backups made on Google drive are stored in the Application data folder. Files stored there can only be accessed by the app, which created them. So you can only see the backups from inside the MyTargets app. The webapp of Google drive furthermore allows you to delete all your backup data (Settings > Manage Apps). When you install the app on another phone and log in with the your Google account you get access to all your backups again.</p>
+                    <summary>Kde sú uložené moje zálohy na Google drive?</summary>
+                    <p>Zálohy vytvorené na Google drive sú uložené v Dátovom adresári aplikácie. Uložené súbory sú prístupné iba aplikácii, ktorá ich vytvorila. Takže zálohy môžete vidieť iba v aplikácii MyTargets. Webový nástroj Google Drive ale umožňuje odstrániť všetky zálohované údaje (Nastavenia > Správa aplikácií). Po inštalácii aplikácie na inom zariadení a prihlásení sa k vášmu Google účtu získate znova prístup ku všetkým vaším zálohám.</p>
                 </details>
             </section>
         </main>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 83e5f84f0..f8bd9ed1e 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d end</item>
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="one">%d arrow</item>
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Options</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Previous</string>
+    <string name="next">Next</string>
+    <string name="save">Save</string>
+    <string name="custom">Custom</string>
+    <string name="training">Training</string>
+    <string name="bow">Bow</string>
+    <string name="arrow">Arrow</string>
+    <string name="round">Round</string>
+    <string name="points">Points</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d arrow selected</item>
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Share</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Exporting failed!</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Name</string>
+    <string name="bow_type">Bow type</string>
+    <string name="properties">Properties</string>
+    <string name="brand">Brand</string>
+    <string name="size">Size</string>
+    <string name="description">Description</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sight settings</string>
+    <string name="add">Add</string>
+    <string name="take_picture">Take a picture</string>
+    <string name="pick_from_gallery">Select a picture from gallery</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Add arrow</string>
+    <string name="length">Length</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Weight</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d end</item>
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="one">%d arrow</item>
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Arrows</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Print</string>
+    <string name="average">Average</string>
+    <!-- Input mode -->
+    <string name="comment">Comment</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Select a file</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 80e601e5d..5cf2e25e0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -15,411 +15,412 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">خيارات</string>
-  <string name="settings">Settings</string>
-  <string name="prev">السابق</string>
-  <string name="next">اللاحق</string>
-  <string name="save">حفظ</string>
-  <string name="custom">تخصيص</string>
-  <string name="training">التمرين</string>
-  <string name="bow">القوس</string>
-  <string name="arrow">السهم</string>
-  <string name="round">جولة</string>
-  <string name="points">النقاط</string>
-  <string name="passe">النهاية</string>
-  <!-- Overview -->
-  <string name="new_training">تمرين جديد</string>
-  <string name="new_bow">قوس جديد</string>
-  <string name="new_arrow">سهم جديد</string>
-  <string name="new_round">جولة جديدة</string>
-  <plurals name="training_selected">
-    <item quantity="zero">%d تمرين محدد</item>
-    <item quantity="one">%d تمرين محدد</item>
-    <item quantity="two">%d تمارين محددة</item>
-    <item quantity="few">%d تمارين محددة</item>
-    <item quantity="many">%d تمارين محددة</item>
-    <item quantity="other">%d تمارين محددة</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="zero">%d قوس محدد</item>
-    <item quantity="one">%d قوس محدد</item>
-    <item quantity="two">%d أقواس محددة</item>
-    <item quantity="few">%d أقواس محددة</item>
-    <item quantity="many">%d أقواس محددة</item>
-    <item quantity="other">%d أقواس محددة</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="zero">%d سهم محدد</item>
-    <item quantity="one">%d سهم محدد</item>
-    <item quantity="two">%d أسهم محددة</item>
-    <item quantity="few">%d أسهم محددة</item>
-    <item quantity="many">%d أسهم محددة</item>
-    <item quantity="other">%d أسهم محددة</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="zero">%d نهاية محددة</item>
-    <item quantity="one">%d نهاية محددة</item>
-    <item quantity="two">%d نهايات محددة</item>
-    <item quantity="few">%d نهايات محددة</item>
-    <item quantity="many">%d نهايات محددة</item>
-    <item quantity="other">%d نهايات محددة</item>
-  </plurals>
-  <string name="edit">تحرير</string>
-  <string name="delete">حذف</string>
-  <string name="statistic">الإحصائيات</string>
-  <!-- Share -->
-  <string name="share">مشاركة</string>
-  <string name="dispersion_pattern">نمك التوزيع</string>
-  <string name="sharing_failed">فشلت المشاركة!</string>
-  <!-- Export -->
-  <string name="send_exported">إرسال البيانات التي تم إصدارها</string>
-  <string name="exporting_failed">فشل في إصدار البيانات!</string>
-  <!-- New bow -->
-  <string name="add_bow">أضف قوس</string>
-  <string name="name">الإسم</string>
-  <string name="bow_type">نوع القوس</string>
-  <string name="properties">الخصائص</string>
-  <string name="brand">الماركة</string>
-  <string name="size">المقاس</string>
-  <string name="description">التفاصيل</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">إعدادات النيشان</string>
-  <string name="add">أضف</string>
-  <string name="take_picture">التقط صورة</string>
-  <string name="pick_from_gallery">اختر صورة من الألبوم</string>
-  <!-- New arrow -->
-  <string name="add_arrow">أضف سهم</string>
-  <string name="length">الطول</string>
-  <string name="spine">درجة الالتواء</string>
-  <string name="weight">الوزن</string>
-  <string name="vanes">ريش السهم</string>
-  <string name="nock">Nock</string>
-  <string name="material">مادة الصنع</string>
-  <!-- New round -->
-  <string name="title">العنوان</string>
-  <string name="outdoor">رماية خارجية</string>
-  <string name="indoor">رماية داخلية</string>
-  <string name="distance">المسافة</string>
-  <string name="format">التنسيق</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="zero">%d ends</item>
-    <item quantity="one">%d end</item>
-    <item quantity="two">%d ends</item>
-    <item quantity="few">%d ends</item>
-    <item quantity="many">%d ends</item>
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">من</string>
-  <plurals name="arrow">
-    <item quantity="zero">ولا سهم</item>
-    <item quantity="one">سهم واحد</item>
-    <item quantity="two">سهمان</item>
-    <item quantity="few">%d أسهم</item>
-    <item quantity="many">%d أسهم</item>
-    <item quantity="other">%d أسهم</item>
-  </plurals>
-  <string name="target_face">ورقة الهدف</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">لوحة النقاط</string>
-  <string name="arrows">أسهم</string>
-  <string name="sum">مجموع النقاط</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">طباعة</string>
-  <string name="average">المتوسط</string>
-  <!-- Input mode -->
-  <string name="comment">تعليق</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">اختر ملف</string>
-  <string name="dir_not_created">لايمكن إنشاء المجلد!</string>
-  <string name="import_failed">فشل في الاستيراد!</string>
-  <string name="file_not_found">الملف غير موجود!</string>
-  <string name="failed_reading_file">فشل في قراءة الملف!</string>
-  <!-- Donate -->
-  <string name="donate_2">تبرع ببرغر</string>
-  <string name="donate_5">تبرع بكباب</string>
-  <string name="donate_10">تبرع ببيتزا كبيرة</string>
-  <string name="donate_20">تبرع بوقود</string>
-  <string name="donation_thank">شكرا على دعمك!</string>
-  <string name="donate_text" formatted="false">المبالغ تتضمن الضريبة و 30% تكاليف شركة Google. بدلا من ذلك يمكنك التبرع عن طريق Paypal إلى الحساب dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">المؤقت</string>
-  <string name="touch_to_start">اضغط للبدء</string>
-  <string name="preparation">استعد</string>
-  <string name="shooting">رماية</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">وقت الرماية</string>
-  <string name="timer_waiting_time">وقت التجهز</string>
-  <string name="timer_warning_time">وقت التحذير</string>
-  <string name="timer_sound">صوت</string>
-  <string name="timer_vibrate">اهتزار</string>
-  <!-- Settings -->
-  <string name="backup_action">النسخ الاحتياطي</string>
-  <string name="import_action">استيراد</string>
-  <string name="exports_as_csv">تصدير البيانات بصيغة csv</string>
-  <string name="licences">ترخيص مفتوح المصدر</string>
-  <string name="licences_summary">الملاحظات القانونية للرخص</string>
-  <string name="version">الإصدار %s</string>
-  <plurals name="second">
-    <item quantity="zero">%d ثانية</item>
-    <item quantity="one">ثانية واحدة</item>
-    <item quantity="two">ثانيتين</item>
-    <item quantity="few">%d ثواني</item>
-    <item quantity="many">%d ثواني</item>
-    <item quantity="other">%d ثواني</item>
-  </plurals>
-  <string name="info">معلومات</string>
-  <string name="data">البيانات</string>
-  <string name="weather">الطقس</string>
-  <string name="environment">البيئة</string>
-  <string name="wind_speed">سرعة الرياح</string>
-  <string name="wind_direction">اتجاه الريح</string>
-  <string name="sight_setting_removed">تم حذف إعدادات النيشان!</string>
-  <string name="metric">متري</string>
-  <string name="imperial">إمبراطورية</string>
-  <string name="undo">تراجع</string>
-  <string name="standard_rounds">خولات اعتيادية</string>
-  <string name="expand_collapse">تكبير\تصغير</string>
-  <string name="new_round_template">قالب جديد</string>
-  <string name="arrow_numbers">أرقام الأسهم</string>
-  <string name="round_removed">تم حذف الجولة!</string>
-  <string name="custom_round">جولة خاصة</string>
-  <string name="filter">مصفي</string>
-  <string name="club">النادي</string>
-  <string name="target">الهدف</string>
-  <string name="standard_round">خولات اعتيادية</string>
-  <string name="use_as_template">هل تريد استخدامه كالقالب أساسي؟</string>
-  <string name="create_copy">هذه جولة اعتيادية!\n هل تريد نسجها لتتمكن من التعديل عليها؟</string>
-  <string name="practice">تدريب</string>
-  <string name="edit_training">تحرير التدريب</string>
-  <string name="edit_standard_round">تحرير الجولة الاعتيادية</string>
-  <plurals name="arrow_deleted">
-    <item quantity="zero">لم يتم حذف أي سهم</item>
-    <item quantity="one">تم حذف سهم واحد</item>
-    <item quantity="two">تم حذف سهمان</item>
-    <item quantity="few">تم حذف %d أسهم</item>
-    <item quantity="many">تم حذف %d أسهم</item>
-    <item quantity="other">تم حذف %d أسهم</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="zero">لم يتم حذف أي قوس</item>
-    <item quantity="one">تم حذف قوس واحد</item>
-    <item quantity="two">تم حذف قوسان</item>
-    <item quantity="few">تم حذف %d أقواس</item>
-    <item quantity="many">تم حذف %d أقواس</item>
-    <item quantity="other">تم حذف %d أقواس</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="zero">لم يتم حذف أي تمرين</item>
-    <item quantity="one">تم حذف تمرين واحد</item>
-    <item quantity="two">تم حذف تمرينان</item>
-    <item quantity="few">تم حذف %d تمارين</item>
-    <item quantity="many">تم حذف %d تمارين</item>
-    <item quantity="other">تم حذف %d تمارين</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="zero">%d ends deleted</item>
-    <item quantity="one">%d end deleted</item>
-    <item quantity="two">%d ends deleted</item>
-    <item quantity="few">%d ends deleted</item>
-    <item quantity="many">%d ends deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="zero">الجولة %d</item>
-    <item quantity="one">الجولة %d</item>
-    <item quantity="two">الجولة %d</item>
-    <item quantity="few">الجولة %d</item>
-    <item quantity="many">الجولة %d</item>
-    <item quantity="other">الجولة %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="zero">لم يتم تحديد أي جولة</item>
-    <item quantity="one">تم تحديد جولة واحدة</item>
-    <item quantity="two">تم تحديد جولتان</item>
-    <item quantity="few">تم تحديد %d جولات</item>
-    <item quantity="many">تم تحديد %d جولات</item>
-    <item quantity="other">تم تحديد %d جولات</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="zero">لم يتم حذف أي جولة</item>
-    <item quantity="one">تم حذف جولة واحدة</item>
-    <item quantity="two">تم حذف جولتان</item>
-    <item quantity="few">تم حذف %d جولات</item>
-    <item quantity="many">تم حذف %d جولات</item>
-    <item quantity="other">تم حذف %d جولات</item>
-  </plurals>
-  <string name="date">تاريخ</string>
-  <string name="edit_round">تحرير جولة</string>
-  <string name="draw_weight">وزن السحبة</string>
-  <string name="sight">نيشان</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">قوسي</string>
-  <string name="my_arrow">سهمي</string>
-  <string name="tip_weight">وزن رأس السهم</string>
-  <string name="arrow_ranking">ترتيب السهم</string>
-  <string name="arrow_x_of_set_of_arrows">السهم %1$s من مجموعة الأسهم %2$s</string>
-  <string name="display">عرض</string>
-  <string name="print">طباعة</string>
-  <string name="table">الجدول</string>
-  <string name="comments">تعليقات</string>
-  <string name="show_points_colored">إظهار النقاط ملونة</string>
-  <string name="stabilizer">الموازن</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">السهم رقم %s</string>
-  <string name="training_with_standard_round">التدرب بجولات اعتيادية</string>
-  <string name="free_training">تدريب حر</string>
-  <string name="competition">مسابقة</string>
-  <string name="about">حول البرنامج</string>
-  <string name="general">عام</string>
-  <string name="contribute">ساهم</string>
-  <string name="connect">تواصل</string>
-  <string name="special_thanks_to">شكر خاص إلى</string>
-  <string name="all_translators">كل الأشخاص الذين ساهموا في ترجمة هذا البرنامج!</string>
-  <string name="all_beta_testers">كل من ساهم في تجربة نسخ البرنامج التجريبية مما أدى إلى استمرارية تطور البرنامج.</string>
-  <string name="test_beta">قم بتجربة آخر نسخة تجريبية</string>
-  <string name="join_on_google_plus">انضم إلينا على Google+</string>
-  <string name="share_with_friends">شارك مع أصدقائك</string>
-  <string name="donate">تبرع</string>
-  <string name="donate_via_paypal">التبرع عن طريق Paypal</string>
-  <string name="translate_crowdin">ترجم عبر Crowdin</string>
-  <string name="network_linkedin">تواصل عبر LinkedIn</string>
-  <string name="search">البحث</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">التمرين بالكامل</string>
-  <string name="show_shots_round">الجولة الحالية</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">الملف الشخصي</string>
-  <string name="birthday">تاريخ الميلاد</string>
-  <string name="first_name">الإسم الأول</string>
-  <string name="last_name">اسم العائلة</string>
-  <string name="age">العمر</string>
-  <string name="show_signature">التوقيع</string>
-  <string name="archer">الرامي</string>
-  <string name="hits">الإصابات</string>
-  <string name="misses">الإخفاقات</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">توزيع</string>
-  <string name="count">عد</string>
-  <string name="diameter">قطر</string>
-  <string name="input">إدخال</string>
-  <string name="target_zoom">درجة تكبير الهدف</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">مقياس قطر السهم</string>
-  <string name="timestamp">التوقيت</string>
-  <string name="change_target_face">غير ورقة الهدف</string>
-  <string name="your_first_training">تمريبك الأمر</string>
-  <string name="grouping">التجميع</string>
-  <string name="show_clusters">المجموعات</string>
-  <string name="first_training_description">اضغط علامة الزائد لبدء تمرين جديد.</string>
-  <string name="show_average">المتوسط</string>
-  <string name="show_none">لا شيء</string>
-  <string name="left_handed">أعسر</string>
-  <string name="right_handed">أيمن</string>
-  <string name="keyboard">لوحة المفاتيح</string>
-  <string name="backup_drive_desc">النسخ الاحتياطي لبياناتك يسمح لك باستعادة جميع بيانات تمارينك الخاصة في حال فقدت أو غيّرت هاتفك.</string>
-  <string name="backup_now">قُم بالنسخ الاحتياطي الآن</string>
-  <string name="last_backup">آخر نسخ احتياطي: %s</string>
-  <string name="recent_backups">النسخ الاحتياطية الأخيرة</string>
-  <string name="dialog_restore_title">العودة إلى الإصدار السابق</string>
-  <string name="restore_desc">عند استعادة النسخة الاحتياطية سيتم استبدال كل البيانات الحالية ببيانات النسخة الاحتياطية.</string>
-  <string name="backup_details">تفاصيل النسخ الاحتياطي</string>
-  <string name="restore">استرجاع النسخة الإحتياطية</string>
-  <string name="backup_location">موقع النسخة الاحتياطية</string>
-  <string name="internal_storage">الذاكرة الداخلية</string>
-  <string name="automatic_backup">النسخ الاحتياطي التلقائي</string>
-  <string name="restoring">يتم استعادة النسخة الاحتياطية…</string>
-  <string name="restore_failed">قشل في استعادة النسخة الاحتياطية</string>
-  <string name="delete_failed">فشلت عملية الحذف</string>
-  <string name="backup_restore_desc">نسخ و استعادة بيانات البرنامج</string>
-  <string name="exporting">جاري التصدير…</string>
-  <string name="loading_backups_failed">فشل في استعادة النسخة الاحتياطية!</string>
-  <string name="external_storage">الذاكرة الخارجية</string>
-  <string name="backup_interval">فترة النسخ الاحتياطي</string>
-  <string name="daily">يومياً</string>
-  <string name="weekly">أسبوعيّا</string>
-  <string name="monthly">شهرياً</string>
-  <string name="connection_failed">فشل في الاتصال!</string>
-  <string name="shooting_indoor">الرماية في الداخل</string>
-  <string name="bow_rest_vertical_position">الموضع العمودي</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">الموضع الأفقي</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">الوتر</string>
-  <string name="bow_scope_magnification">تكبير منظار القوس</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">زر القوس</string>
-  <string name="more_fields">المزيد من الحقول</string>
-  <string name="recently_used">المستخدمة مؤخرا</string>
-  <string name="intro_title_track_training_progress">انسى أوراق حساب النقاط!</string>
-  <string name="intro_description_track_training_progress">مع الرسم البيانات الدقيق للأسهم، \n يمكنك الحصول على معلومات مفيدة\n من بيانات تمرينك.</string>
-  <string name="intro_title_everything_in_one_place">كل ما تحتاجه\n في مكان واحد</string>
-  <string name="intro_description_everything_in_one_place">متضمن القوس-، السهم-،\nو إدارة النيشان،\nمؤقت الرماية، إحصائيات \n و غير ذلك الكثير…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">أظهر الجولة</string>
-  <string name="show_training">أظهر التمرين</string>
-  <string name="summary">ملخص</string>
-  <string name="end">End</string>
-  <string name="average_of">متوسط</string>
-  <string name="displayed_shots">عرض الرميات</string>
-  <string name="invalid_decimal_number">عدد عشري غير صحيح</string>
-  <string name="not_within_expected_range_mm">ليس من ضمن النطاق المتوقع 1 إلى 20 مم</string>
-  <string name="not_within_expected_range_inch">ليس من ضمن النطاق المتوقع 0 إلى 1 بوصة</string>
-  <string name="next_round">الجولة اللاحقة</string>
-  <string name="previous_round">الجولة السابقة</string>
-  <string name="overview">نظرة عامة</string>
-  <string name="score">مجموع النقاط</string>
-  <string name="show_reached_score">عرض النتيجة التي تم الوصول إليها</string>
-  <string name="show_total_score">أظهر مجموع النقاط</string>
-  <string name="show_percentage">أظهر النسبة</string>
-  <string name="show_arrow_average">أظهر متوسط الأسهم</string>
-  <string name="image_deleted">تم حذف الصورة</string>
-  <string name="delete_image">هل ترغب في حذف الصورة؟</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">خيارات</string>
+    <string name="settings">Settings</string>
+    <string name="prev">السابق</string>
+    <string name="next">اللاحق</string>
+    <string name="save">حفظ</string>
+    <string name="custom">تخصيص</string>
+    <string name="training">التمرين</string>
+    <string name="bow">القوس</string>
+    <string name="arrow">السهم</string>
+    <string name="round">جولة</string>
+    <string name="points">النقاط</string>
+    <string name="passe">النهاية</string>
+    <!-- Overview -->
+    <string name="new_training">تمرين جديد</string>
+    <string name="new_bow">قوس جديد</string>
+    <string name="new_arrow">سهم جديد</string>
+    <string name="new_round">جولة جديدة</string>
+    <plurals name="training_selected">
+        <item quantity="zero">%d تمرين محدد</item>
+        <item quantity="one">%d تمرين محدد</item>
+        <item quantity="two">%d تمارين محددة</item>
+        <item quantity="few">%d تمارين محددة</item>
+        <item quantity="many">%d تمارين محددة</item>
+        <item quantity="other">%d تمارين محددة</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="zero">%d قوس محدد</item>
+        <item quantity="one">%d قوس محدد</item>
+        <item quantity="two">%d أقواس محددة</item>
+        <item quantity="few">%d أقواس محددة</item>
+        <item quantity="many">%d أقواس محددة</item>
+        <item quantity="other">%d أقواس محددة</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="zero">%d سهم محدد</item>
+        <item quantity="one">%d سهم محدد</item>
+        <item quantity="two">%d أسهم محددة</item>
+        <item quantity="few">%d أسهم محددة</item>
+        <item quantity="many">%d أسهم محددة</item>
+        <item quantity="other">%d أسهم محددة</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="zero">%d نهاية محددة</item>
+        <item quantity="one">%d نهاية محددة</item>
+        <item quantity="two">%d نهايات محددة</item>
+        <item quantity="few">%d نهايات محددة</item>
+        <item quantity="many">%d نهايات محددة</item>
+        <item quantity="other">%d نهايات محددة</item>
+    </plurals>
+    <string name="edit">تحرير</string>
+    <string name="delete">حذف</string>
+    <string name="statistic">الإحصائيات</string>
+    <!-- Share -->
+    <string name="share">مشاركة</string>
+    <string name="dispersion_pattern">نمك التوزيع</string>
+    <string name="sharing_failed">فشلت المشاركة!</string>
+    <!-- Export -->
+    <string name="send_exported">إرسال البيانات التي تم إصدارها</string>
+    <string name="exporting_failed">فشل في إصدار البيانات!</string>
+    <!-- New bow -->
+    <string name="add_bow">أضف قوس</string>
+    <string name="name">الإسم</string>
+    <string name="bow_type">نوع القوس</string>
+    <string name="properties">الخصائص</string>
+    <string name="brand">الماركة</string>
+    <string name="size">المقاس</string>
+    <string name="description">التفاصيل</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">إعدادات النيشان</string>
+    <string name="add">أضف</string>
+    <string name="take_picture">التقط صورة</string>
+    <string name="pick_from_gallery">اختر صورة من الألبوم</string>
+    <!-- New arrow -->
+    <string name="add_arrow">أضف سهم</string>
+    <string name="length">الطول</string>
+    <string name="spine">درجة الالتواء</string>
+    <string name="weight">الوزن</string>
+    <string name="vanes">ريش السهم</string>
+    <string name="nock">Nock</string>
+    <string name="material">مادة الصنع</string>
+    <!-- New round -->
+    <string name="title">العنوان</string>
+    <string name="outdoor">رماية خارجية</string>
+    <string name="indoor">رماية داخلية</string>
+    <string name="distance">المسافة</string>
+    <string name="format">التنسيق</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="zero">%d ends</item>
+        <item quantity="one">%d end</item>
+        <item quantity="two">%d ends</item>
+        <item quantity="few">%d ends</item>
+        <item quantity="many">%d ends</item>
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">من</string>
+    <plurals name="arrow">
+        <item quantity="zero">ولا سهم</item>
+        <item quantity="one">سهم واحد</item>
+        <item quantity="two">سهمان</item>
+        <item quantity="few">%d أسهم</item>
+        <item quantity="many">%d أسهم</item>
+        <item quantity="other">%d أسهم</item>
+    </plurals>
+    <string name="target_face">ورقة الهدف</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">لوحة النقاط</string>
+    <string name="arrows">أسهم</string>
+    <string name="sum">مجموع النقاط</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">طباعة</string>
+    <string name="average">المتوسط</string>
+    <!-- Input mode -->
+    <string name="comment">تعليق</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">اختر ملف</string>
+    <string name="dir_not_created">لايمكن إنشاء المجلد!</string>
+    <string name="import_failed">فشل في الاستيراد!</string>
+    <string name="file_not_found">الملف غير موجود!</string>
+    <string name="failed_reading_file">فشل في قراءة الملف!</string>
+    <!-- Donate -->
+    <string name="donate_2">تبرع ببرغر</string>
+    <string name="donate_5">تبرع بكباب</string>
+    <string name="donate_10">تبرع ببيتزا كبيرة</string>
+    <string name="donate_20">تبرع بوقود</string>
+    <string name="donation_thank">شكرا على دعمك!</string>
+    <string name="donate_text" formatted="false">المبالغ تتضمن الضريبة و 30% تكاليف شركة Google. بدلا من ذلك يمكنك التبرع عن طريق Paypal إلى الحساب dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">المؤقت</string>
+    <string name="touch_to_start">اضغط للبدء</string>
+    <string name="preparation">استعد</string>
+    <string name="shooting">رماية</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">وقت الرماية</string>
+    <string name="timer_waiting_time">وقت التجهز</string>
+    <string name="timer_warning_time">وقت التحذير</string>
+    <string name="timer_sound">صوت</string>
+    <string name="timer_vibrate">اهتزار</string>
+    <!-- Settings -->
+    <string name="backup_action">النسخ الاحتياطي</string>
+    <string name="import_action">استيراد</string>
+    <string name="exports_as_csv">تصدير البيانات بصيغة csv</string>
+    <string name="licences">ترخيص مفتوح المصدر</string>
+    <string name="licences_summary">الملاحظات القانونية للرخص</string>
+    <string name="version">الإصدار %s</string>
+    <plurals name="second">
+        <item quantity="zero">%d ثانية</item>
+        <item quantity="one">ثانية واحدة</item>
+        <item quantity="two">ثانيتين</item>
+        <item quantity="few">%d ثواني</item>
+        <item quantity="many">%d ثواني</item>
+        <item quantity="other">%d ثواني</item>
+    </plurals>
+    <string name="info">معلومات</string>
+    <string name="data">البيانات</string>
+    <string name="weather">الطقس</string>
+    <string name="environment">البيئة</string>
+    <string name="wind_speed">سرعة الرياح</string>
+    <string name="wind_direction">اتجاه الريح</string>
+    <string name="sight_setting_removed">تم حذف إعدادات النيشان!</string>
+    <string name="metric">متري</string>
+    <string name="imperial">إمبراطورية</string>
+    <string name="undo">تراجع</string>
+    <string name="standard_rounds">خولات اعتيادية</string>
+    <string name="expand_collapse">تكبير\تصغير</string>
+    <string name="new_round_template">قالب جديد</string>
+    <string name="arrow_numbers">أرقام الأسهم</string>
+    <string name="round_removed">تم حذف الجولة!</string>
+    <string name="custom_round">جولة خاصة</string>
+    <string name="filter">مصفي</string>
+    <string name="club">النادي</string>
+    <string name="target">الهدف</string>
+    <string name="standard_round">خولات اعتيادية</string>
+    <string name="use_as_template">هل تريد استخدامه كالقالب أساسي؟</string>
+    <string name="create_copy">هذه جولة اعتيادية!\n هل تريد نسجها لتتمكن من التعديل عليها؟</string>
+    <string name="practice">تدريب</string>
+    <string name="edit_training">تحرير التدريب</string>
+    <string name="edit_standard_round">تحرير الجولة الاعتيادية</string>
+    <plurals name="arrow_deleted">
+        <item quantity="zero">لم يتم حذف أي سهم</item>
+        <item quantity="one">تم حذف سهم واحد</item>
+        <item quantity="two">تم حذف سهمان</item>
+        <item quantity="few">تم حذف %d أسهم</item>
+        <item quantity="many">تم حذف %d أسهم</item>
+        <item quantity="other">تم حذف %d أسهم</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="zero">لم يتم حذف أي قوس</item>
+        <item quantity="one">تم حذف قوس واحد</item>
+        <item quantity="two">تم حذف قوسان</item>
+        <item quantity="few">تم حذف %d أقواس</item>
+        <item quantity="many">تم حذف %d أقواس</item>
+        <item quantity="other">تم حذف %d أقواس</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="zero">لم يتم حذف أي تمرين</item>
+        <item quantity="one">تم حذف تمرين واحد</item>
+        <item quantity="two">تم حذف تمرينان</item>
+        <item quantity="few">تم حذف %d تمارين</item>
+        <item quantity="many">تم حذف %d تمارين</item>
+        <item quantity="other">تم حذف %d تمارين</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="zero">%d ends deleted</item>
+        <item quantity="one">%d end deleted</item>
+        <item quantity="two">%d ends deleted</item>
+        <item quantity="few">%d ends deleted</item>
+        <item quantity="many">%d ends deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="zero">الجولة %d</item>
+        <item quantity="one">الجولة %d</item>
+        <item quantity="two">الجولة %d</item>
+        <item quantity="few">الجولة %d</item>
+        <item quantity="many">الجولة %d</item>
+        <item quantity="other">الجولة %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="zero">لم يتم تحديد أي جولة</item>
+        <item quantity="one">تم تحديد جولة واحدة</item>
+        <item quantity="two">تم تحديد جولتان</item>
+        <item quantity="few">تم تحديد %d جولات</item>
+        <item quantity="many">تم تحديد %d جولات</item>
+        <item quantity="other">تم تحديد %d جولات</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="zero">لم يتم حذف أي جولة</item>
+        <item quantity="one">تم حذف جولة واحدة</item>
+        <item quantity="two">تم حذف جولتان</item>
+        <item quantity="few">تم حذف %d جولات</item>
+        <item quantity="many">تم حذف %d جولات</item>
+        <item quantity="other">تم حذف %d جولات</item>
+    </plurals>
+    <string name="date">تاريخ</string>
+    <string name="edit_round">تحرير جولة</string>
+    <string name="draw_weight">وزن السحبة</string>
+    <string name="sight">نيشان</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">قوسي</string>
+    <string name="my_arrow">سهمي</string>
+    <string name="tip_weight">وزن رأس السهم</string>
+    <string name="arrow_ranking">ترتيب السهم</string>
+    <string name="arrow_x_of_set_of_arrows">السهم %1$s من مجموعة الأسهم %2$s</string>
+    <string name="display">عرض</string>
+    <string name="print">طباعة</string>
+    <string name="table">الجدول</string>
+    <string name="comments">تعليقات</string>
+    <string name="show_points_colored">إظهار النقاط ملونة</string>
+    <string name="stabilizer">الموازن</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">السهم رقم %s</string>
+    <string name="training_with_standard_round">التدرب بجولات اعتيادية</string>
+    <string name="free_training">تدريب حر</string>
+    <string name="competition">مسابقة</string>
+    <string name="about">حول البرنامج</string>
+    <string name="general">عام</string>
+    <string name="contribute">ساهم</string>
+    <string name="connect">تواصل</string>
+    <string name="special_thanks_to">شكر خاص إلى</string>
+    <string name="all_translators">كل الأشخاص الذين ساهموا في ترجمة هذا البرنامج!</string>
+    <string name="all_beta_testers">كل من ساهم في تجربة نسخ البرنامج التجريبية مما أدى إلى استمرارية تطور البرنامج.</string>
+    <string name="test_beta">قم بتجربة آخر نسخة تجريبية</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">شارك مع أصدقائك</string>
+    <string name="donate">تبرع</string>
+    <string name="donate_via_paypal">التبرع عن طريق Paypal</string>
+    <string name="translate_crowdin">ترجم عبر Crowdin</string>
+    <string name="network_linkedin">تواصل عبر LinkedIn</string>
+    <string name="search">البحث</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">التمرين بالكامل</string>
+    <string name="show_shots_round">الجولة الحالية</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">الملف الشخصي</string>
+    <string name="birthday">تاريخ الميلاد</string>
+    <string name="first_name">الإسم الأول</string>
+    <string name="last_name">اسم العائلة</string>
+    <string name="age">العمر</string>
+    <string name="show_signature">التوقيع</string>
+    <string name="archer">الرامي</string>
+    <string name="hits">الإصابات</string>
+    <string name="misses">الإخفاقات</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">توزيع</string>
+    <string name="count">عد</string>
+    <string name="diameter">قطر</string>
+    <string name="input">إدخال</string>
+    <string name="target_zoom">درجة تكبير الهدف</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">مقياس قطر السهم</string>
+    <string name="timestamp">التوقيت</string>
+    <string name="change_target_face">غير ورقة الهدف</string>
+    <string name="your_first_training">تمريبك الأمر</string>
+    <string name="grouping">التجميع</string>
+    <string name="show_clusters">المجموعات</string>
+    <string name="first_training_description">اضغط علامة الزائد لبدء تمرين جديد.</string>
+    <string name="show_average">المتوسط</string>
+    <string name="show_none">لا شيء</string>
+    <string name="left_handed">أعسر</string>
+    <string name="right_handed">أيمن</string>
+    <string name="keyboard">لوحة المفاتيح</string>
+    <string name="backup_drive_desc">النسخ الاحتياطي لبياناتك يسمح لك باستعادة جميع بيانات تمارينك الخاصة في حال فقدت أو غيّرت هاتفك.</string>
+    <string name="backup_now">قُم بالنسخ الاحتياطي الآن</string>
+    <string name="last_backup">آخر نسخ احتياطي: %s</string>
+    <string name="recent_backups">النسخ الاحتياطية الأخيرة</string>
+    <string name="dialog_restore_title">العودة إلى الإصدار السابق</string>
+    <string name="restore_desc">عند استعادة النسخة الاحتياطية سيتم استبدال كل البيانات الحالية ببيانات النسخة الاحتياطية.</string>
+    <string name="backup_details">تفاصيل النسخ الاحتياطي</string>
+    <string name="restore">استرجاع النسخة الإحتياطية</string>
+    <string name="backup_location">موقع النسخة الاحتياطية</string>
+    <string name="internal_storage">الذاكرة الداخلية</string>
+    <string name="automatic_backup">النسخ الاحتياطي التلقائي</string>
+    <string name="restoring">يتم استعادة النسخة الاحتياطية…</string>
+    <string name="restore_failed">قشل في استعادة النسخة الاحتياطية</string>
+    <string name="delete_failed">فشلت عملية الحذف</string>
+    <string name="backup_restore_desc">نسخ و استعادة بيانات البرنامج</string>
+    <string name="exporting">جاري التصدير…</string>
+    <string name="loading_backups_failed">فشل في استعادة النسخة الاحتياطية!</string>
+    <string name="external_storage">الذاكرة الخارجية</string>
+    <string name="backup_interval">فترة النسخ الاحتياطي</string>
+    <string name="daily">يومياً</string>
+    <string name="weekly">أسبوعيّا</string>
+    <string name="monthly">شهرياً</string>
+    <string name="connection_failed">فشل في الاتصال!</string>
+    <string name="shooting_indoor">الرماية في الداخل</string>
+    <string name="bow_rest_vertical_position">الموضع العمودي</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">الموضع الأفقي</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">الوتر</string>
+    <string name="bow_scope_magnification">تكبير منظار القوس</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">زر القوس</string>
+    <string name="more_fields">المزيد من الحقول</string>
+    <string name="recently_used">المستخدمة مؤخرا</string>
+    <string name="intro_title_track_training_progress">انسى أوراق حساب النقاط!</string>
+    <string name="intro_description_track_training_progress">مع الرسم البيانات الدقيق للأسهم، \n يمكنك الحصول على معلومات مفيدة\n من بيانات تمرينك.</string>
+    <string name="intro_title_everything_in_one_place">كل ما تحتاجه\n في مكان واحد</string>
+    <string name="intro_description_everything_in_one_place">متضمن القوس-، السهم-،\nو إدارة النيشان،\nمؤقت الرماية، إحصائيات \n و غير ذلك الكثير…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">أظهر الجولة</string>
+    <string name="show_training">أظهر التمرين</string>
+    <string name="summary">ملخص</string>
+    <string name="end">End</string>
+    <string name="average_of">متوسط</string>
+    <string name="displayed_shots">عرض الرميات</string>
+    <string name="invalid_decimal_number">عدد عشري غير صحيح</string>
+    <string name="not_within_expected_range_mm">ليس من ضمن النطاق المتوقع 1 إلى 20 مم</string>
+    <string name="not_within_expected_range_inch">ليس من ضمن النطاق المتوقع 0 إلى 1 بوصة</string>
+    <string name="next_round">الجولة اللاحقة</string>
+    <string name="previous_round">الجولة السابقة</string>
+    <string name="overview">نظرة عامة</string>
+    <string name="score">مجموع النقاط</string>
+    <string name="show_reached_score">عرض النتيجة التي تم الوصول إليها</string>
+    <string name="show_total_score">أظهر مجموع النقاط</string>
+    <string name="show_percentage">أظهر النسبة</string>
+    <string name="show_arrow_average">أظهر متوسط الأسهم</string>
+    <string name="image_deleted">تم حذف الصورة</string>
+    <string name="delete_image">هل ترغب في حذف الصورة؟</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0d84783ed..c9eccb34c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opcions</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Anterior</string>
-  <string name="next">Següent</string>
-  <string name="save">Guardar</string>
-  <string name="custom">Modificar</string>
-  <string name="training">Entrenament</string>
-  <string name="bow">Arc</string>
-  <string name="arrow">Fletxa</string>
-  <string name="round">Ronda</string>
-  <string name="points">Punts</string>
-  <string name="passe">Tirada</string>
-  <!-- Overview -->
-  <string name="new_training">Nou entrenament</string>
-  <string name="new_bow">Nou arc</string>
-  <string name="new_arrow">Nova fletxa</string>
-  <string name="new_round">Nova ronda</string>
-  <plurals name="training_selected">
-    <item quantity="one">Un entrenament seleccionat</item>
-    <item quantity="other">%d entrenaments seleccionats</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Un arc seleccionat</item>
-    <item quantity="other">%d arcs seleccionats</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Una fletxa seleccionada</item>
-    <item quantity="other">%d fletxes seleccionades</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Una tirada seleccionada</item>
-    <item quantity="other">%d tirades seleccionades</item>
-  </plurals>
-  <string name="edit">Editar</string>
-  <string name="delete">Esborrar</string>
-  <string name="statistic">Estadística</string>
-  <!-- Share -->
-  <string name="share">Compartir</string>
-  <string name="dispersion_pattern">Agrupació de fletxes</string>
-  <string name="sharing_failed">Error al compartir!</string>
-  <!-- Export -->
-  <string name="send_exported">Enviar dades</string>
-  <string name="exporting_failed">Error al exportar!</string>
-  <!-- New bow -->
-  <string name="add_bow">Afegir arc</string>
-  <string name="name">Nom</string>
-  <string name="bow_type">Tipus d´arc</string>
-  <string name="properties">Propietats</string>
-  <string name="brand">Marca</string>
-  <string name="size">Mida</string>
-  <string name="description">Descripció</string>
-  <string name="height">Mida de pala</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Configuració del visor</string>
-  <string name="add">Afegir</string>
-  <string name="take_picture">Fer foto</string>
-  <string name="pick_from_gallery">Selecciona una foto de la galeria</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Afegir fletxa</string>
-  <string name="length">Longitud</string>
-  <string name="spine">Calibre</string>
-  <string name="weight">Pes</string>
-  <string name="vanes">Plumes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Títol</string>
-  <string name="outdoor">Aire lliure</string>
-  <string name="indoor">Sala</string>
-  <string name="distance">Distància</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d tirada</item>
-    <item quantity="other">%d tirades</item>
-  </plurals>
-  <string name="with">de</string>
-  <plurals name="arrow">
-    <item quantity="one">%d fletxa</item>
-    <item quantity="other">%d fletxes</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Marcador</string>
-  <string name="arrows">Fletxes</string>
-  <string name="sum">Suma</string>
-  <string name="carry">Total</string>
-  <string name="action_print">Imprimir</string>
-  <string name="average">Promig</string>
-  <!-- Input mode -->
-  <string name="comment">Comentari</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Selecciona un fitxer</string>
-  <string name="dir_not_created">El directori podria no estat creat!</string>
-  <string name="import_failed">Importació fallida!</string>
-  <string name="file_not_found">Arxiu no trobat!</string>
-  <string name="failed_reading_file">Arxiu de lectura fallit!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donam per una hamburguesa</string>
-  <string name="donate_5">Donam per un kebab</string>
-  <string name="donate_10">Donam per una pizza</string>
-  <string name="donate_20">Donam per betzina</string>
-  <string name="donation_thank">Gràcies pel teu suport!</string>
-  <string name="donate_text" formatted="false">Les quantitats incloeixen VAT. i el 30%d´honoraris per  Google. Alternativament, estaria molt agrait de rebre una donació en la compte de PayPal dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Temporitzador</string>
-  <string name="touch_to_start">Toca per començar</string>
-  <string name="preparation">Preparat</string>
-  <string name="shooting">Tira</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Temps per tirar</string>
-  <string name="timer_waiting_time">Temps de preparació</string>
-  <string name="timer_warning_time">Atenció temps</string>
-  <string name="timer_sound">So</string>
-  <string name="timer_vibrate">Vibració</string>
-  <!-- Settings -->
-  <string name="backup_action">Còpia de seguretat</string>
-  <string name="import_action">Importar</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Codi obert- Llicències</string>
-  <string name="licences_summary">Notes legals</string>
-  <string name="version">Versió %s</string>
-  <plurals name="second">
-    <item quantity="one">%d segon</item>
-    <item quantity="other">%d segons</item>
-  </plurals>
-  <string name="info">Informació</string>
-  <string name="data">Dades</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Desfés</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Tirada %1$d/%2$d</string>
-  <string name="round_x_of_y">Ronda %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opcions</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Anterior</string>
+    <string name="next">Següent</string>
+    <string name="save">Guardar</string>
+    <string name="custom">Modificar</string>
+    <string name="training">Entrenament</string>
+    <string name="bow">Arc</string>
+    <string name="arrow">Fletxa</string>
+    <string name="round">Ronda</string>
+    <string name="points">Punts</string>
+    <string name="passe">Tirada</string>
+    <!-- Overview -->
+    <string name="new_training">Nou entrenament</string>
+    <string name="new_bow">Nou arc</string>
+    <string name="new_arrow">Nova fletxa</string>
+    <string name="new_round">Nova ronda</string>
+    <plurals name="training_selected">
+        <item quantity="one">Un entrenament seleccionat</item>
+        <item quantity="other">%d entrenaments seleccionats</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">Un arc seleccionat</item>
+        <item quantity="other">%d arcs seleccionats</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">Una fletxa seleccionada</item>
+        <item quantity="other">%d fletxes seleccionades</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">Una tirada seleccionada</item>
+        <item quantity="other">%d tirades seleccionades</item>
+    </plurals>
+    <string name="edit">Editar</string>
+    <string name="delete">Esborrar</string>
+    <string name="statistic">Estadística</string>
+    <!-- Share -->
+    <string name="share">Compartir</string>
+    <string name="dispersion_pattern">Agrupació de fletxes</string>
+    <string name="sharing_failed">Error al compartir!</string>
+    <!-- Export -->
+    <string name="send_exported">Enviar dades</string>
+    <string name="exporting_failed">Error al exportar!</string>
+    <!-- New bow -->
+    <string name="add_bow">Afegir arc</string>
+    <string name="name">Nom</string>
+    <string name="bow_type">Tipus d´arc</string>
+    <string name="properties">Propietats</string>
+    <string name="brand">Marca</string>
+    <string name="size">Mida</string>
+    <string name="description">Descripció</string>
+    <string name="height">Mida de pala</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Configuració del visor</string>
+    <string name="add">Afegir</string>
+    <string name="take_picture">Fer foto</string>
+    <string name="pick_from_gallery">Selecciona una foto de la galeria</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Afegir fletxa</string>
+    <string name="length">Longitud</string>
+    <string name="spine">Calibre</string>
+    <string name="weight">Pes</string>
+    <string name="vanes">Plumes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Títol</string>
+    <string name="outdoor">Aire lliure</string>
+    <string name="indoor">Sala</string>
+    <string name="distance">Distància</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d tirada</item>
+        <item quantity="other">%d tirades</item>
+    </plurals>
+    <string name="with">de</string>
+    <plurals name="arrow">
+        <item quantity="one">%d fletxa</item>
+        <item quantity="other">%d fletxes</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Marcador</string>
+    <string name="arrows">Fletxes</string>
+    <string name="sum">Suma</string>
+    <string name="carry">Total</string>
+    <string name="action_print">Imprimir</string>
+    <string name="average">Promig</string>
+    <!-- Input mode -->
+    <string name="comment">Comentari</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Selecciona un fitxer</string>
+    <string name="dir_not_created">El directori podria no estat creat!</string>
+    <string name="import_failed">Importació fallida!</string>
+    <string name="file_not_found">Arxiu no trobat!</string>
+    <string name="failed_reading_file">Arxiu de lectura fallit!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donam per una hamburguesa</string>
+    <string name="donate_5">Donam per un kebab</string>
+    <string name="donate_10">Donam per una pizza</string>
+    <string name="donate_20">Donam per betzina</string>
+    <string name="donation_thank">Gràcies pel teu suport!</string>
+    <string name="donate_text" formatted="false">Les quantitats incloeixen VAT. i el 30%d´honoraris per  Google. Alternativament, estaria molt agrait de rebre una donació en la compte de PayPal dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Temporitzador</string>
+    <string name="touch_to_start">Toca per començar</string>
+    <string name="preparation">Preparat</string>
+    <string name="shooting">Tira</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Temps per tirar</string>
+    <string name="timer_waiting_time">Temps de preparació</string>
+    <string name="timer_warning_time">Atenció temps</string>
+    <string name="timer_sound">So</string>
+    <string name="timer_vibrate">Vibració</string>
+    <!-- Settings -->
+    <string name="backup_action">Còpia de seguretat</string>
+    <string name="import_action">Importar</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Codi obert- Llicències</string>
+    <string name="licences_summary">Notes legals</string>
+    <string name="version">Versió %s</string>
+    <plurals name="second">
+        <item quantity="one">%d segon</item>
+        <item quantity="other">%d segons</item>
+    </plurals>
+    <string name="info">Informació</string>
+    <string name="data">Dades</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Desfés</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Tirada %1$d/%2$d</string>
+    <string name="round_x_of_y">Ronda %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9c597adfb..291f86043 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Možnosti</string>
-  <string name="settings">Nastavení</string>
-  <string name="prev">Předchozí</string>
-  <string name="next">Další</string>
-  <string name="save">Uložit</string>
-  <string name="custom">Vlastní</string>
-  <string name="training">Trénink</string>
-  <string name="bow">Luk</string>
-  <string name="arrow">Šíp</string>
-  <string name="round">Kolo</string>
-  <string name="points">Bodů</string>
-  <string name="passe">Sada</string>
-  <!-- Overview -->
-  <string name="new_training">Nový trénink</string>
-  <string name="new_bow">Nový luk</string>
-  <string name="new_arrow">Nový šíp</string>
-  <string name="new_round">Nové kolo</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d vybraný trénink</item>
-    <item quantity="few">%d vybrané tréninky</item>
-    <item quantity="many">%d vybraných tréninků</item>
-    <item quantity="other">%d vybraných tréninků</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d vybraný luk</item>
-    <item quantity="few">%d vybrané luky</item>
-    <item quantity="many">%d vybraných luků</item>
-    <item quantity="other">%d vybraných luků</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d vybraný šíp</item>
-    <item quantity="few">%d vybrané šípy</item>
-    <item quantity="many">%d vybraných šípů</item>
-    <item quantity="other">%d vybraných šípů</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d vybraná sada</item>
-    <item quantity="few">%d vybrané sady</item>
-    <item quantity="many">%d vybraných sad</item>
-    <item quantity="other">%d vybraných sad</item>
-  </plurals>
-  <string name="edit">Upravit</string>
-  <string name="delete">Odstranit</string>
-  <string name="statistic">Statistiky</string>
-  <!-- Share -->
-  <string name="share">Sdílet</string>
-  <string name="dispersion_pattern">Rozptylový vzor</string>
-  <string name="sharing_failed">Sdílení se nezdařilo!</string>
-  <!-- Export -->
-  <string name="send_exported">Odeslat exportovaná data</string>
-  <string name="exporting_failed">Export se nezdařil!</string>
-  <!-- New bow -->
-  <string name="add_bow">Přidat luk</string>
-  <string name="name">Jméno</string>
-  <string name="bow_type">Typ luku</string>
-  <string name="properties">Vlastnosti</string>
-  <string name="brand">Značka</string>
-  <string name="size">Velikost</string>
-  <string name="description">Popis</string>
-  <string name="height">Výška tětivy</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Nastavení zaměřovače</string>
-  <string name="add">Přidat</string>
-  <string name="take_picture">Vyfotit obrázek</string>
-  <string name="pick_from_gallery">Vyber obrázek z galerie</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Přidat šip</string>
-  <string name="length">Délka</string>
-  <string name="spine">Tvrdost</string>
-  <string name="weight">Hmotnost</string>
-  <string name="vanes">Letky</string>
-  <string name="nock">Končík</string>
-  <string name="material">Materiál</string>
-  <!-- New round -->
-  <string name="title">Název</string>
-  <string name="outdoor">Venkovní</string>
-  <string name="indoor">Vnitřní</string>
-  <string name="distance">Vzdálenost</string>
-  <string name="format">Formát</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d sada</item>
-    <item quantity="few">%d sady</item>
-    <item quantity="many">%d ends</item>
-    <item quantity="other">%d sad</item>
-  </plurals>
-  <string name="with">z</string>
-  <plurals name="arrow">
-    <item quantity="one">%d šíp</item>
-    <item quantity="few">%d šípy</item>
-    <item quantity="many">%d arrows</item>
-    <item quantity="other">%d šípů</item>
-  </plurals>
-  <string name="target_face">Typ terče</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Tabulka výsledků</string>
-  <string name="arrows">Šípy</string>
-  <string name="sum">Součet</string>
-  <string name="carry">Celkem</string>
-  <string name="action_print">Tisk</string>
-  <string name="average">Průměr</string>
-  <!-- Input mode -->
-  <string name="comment">Komentář</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Vybrat soubor</string>
-  <string name="dir_not_created">Nelze vytvořit adresář!</string>
-  <string name="import_failed">Import se nezdařil!</string>
-  <string name="file_not_found">Soubor nenalezen!</string>
-  <string name="failed_reading_file">Selhalo načtení souboru!</string>
-  <!-- Donate -->
-  <string name="donate_2">Přispět na hamburgr</string>
-  <string name="donate_5">Přispět na kebab</string>
-  <string name="donate_10">Přispět na velkou pizzu</string>
-  <string name="donate_20">Přispět na nějaké palivo</string>
-  <string name="donation_thank">Děkuji vám za vaši podporu!</string>
-  <string name="donate_text" formatted="false">Částky jsou včetně DPH a 30% poplatku Googlu. Také můžete přispět na PayPal účet dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Časomíra</string>
-  <string name="touch_to_start">Stiskem spustit</string>
-  <string name="preparation">Připrav se</string>
-  <string name="shooting">Střelba</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Čas střelby</string>
-  <string name="timer_waiting_time">Čas přípravy</string>
-  <string name="timer_warning_time">Čas výstrahy</string>
-  <string name="timer_sound">Zvuk</string>
-  <string name="timer_vibrate">Vibrace</string>
-  <!-- Settings -->
-  <string name="backup_action">Zálohovat</string>
-  <string name="import_action">Importovat</string>
-  <string name="exports_as_csv">Exportovat jako csv</string>
-  <string name="licences">Licence Open-Source</string>
-  <string name="licences_summary">Právní poznámky k licencím</string>
-  <string name="version">Verze %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekunda</item>
-    <item quantity="few">%d sekundy</item>
-    <item quantity="many">%d seconds</item>
-    <item quantity="other">%d sekund</item>
-  </plurals>
-  <string name="info">Informace</string>
-  <string name="data">Data</string>
-  <string name="weather">Počasí</string>
-  <string name="environment">Prostředí</string>
-  <string name="wind_speed">Rychlost větru</string>
-  <string name="wind_direction">Směr větru</string>
-  <string name="sight_setting_removed">Nastavení zaměřovače smazané!</string>
-  <string name="metric">Metrické</string>
-  <string name="imperial">Imperiální</string>
-  <string name="undo">Vrátit zpět</string>
-  <string name="standard_rounds">Standardní kola</string>
-  <string name="expand_collapse">Rozbalit/Sbalit</string>
-  <string name="new_round_template">Nová šablona</string>
-  <string name="arrow_numbers">Čísla šípů</string>
-  <string name="round_removed">Kolo smazáno!</string>
-  <string name="custom_round">Vlastní kolo</string>
-  <string name="filter">Filtr</string>
-  <string name="club">Klub</string>
-  <string name="target">Terč</string>
-  <string name="standard_round">Standardní kolo</string>
-  <string name="use_as_template">Použít jako šablonu?</string>
-  <string name="create_copy">Toto je standardní kolo!\nChcete vytvořit kopii, abyste ho mohli upravovat?</string>
-  <string name="practice">Cvičení</string>
-  <string name="edit_training">Upravit trénink</string>
-  <string name="edit_standard_round">Upravit standardní kolo</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d smazaný šíp</item>
-    <item quantity="few">%d smazané šípy</item>
-    <item quantity="many">%d smazaných šípů</item>
-    <item quantity="other">%d smazaných šípů</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d smazaný luk</item>
-    <item quantity="few">%d smazané luky</item>
-    <item quantity="many">%d smazaných luků</item>
-    <item quantity="other">%d smazaných luků</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d smazaný trénink</item>
-    <item quantity="few">%d smazané tréninky</item>
-    <item quantity="many">%d smazaných tréninků</item>
-    <item quantity="other">%d smazaných tréninků</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d smazaná sada</item>
-    <item quantity="few">%d smazané sady</item>
-    <item quantity="many">%d smazaných sad</item>
-    <item quantity="other">%d smazaných sad</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Kolo %d</item>
-    <item quantity="few">Kolo %d</item>
-    <item quantity="many">Kolo %d</item>
-    <item quantity="other">Kolo %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d vybrané kolo</item>
-    <item quantity="few">%d vybraná kola</item>
-    <item quantity="many">%d vybraných kol</item>
-    <item quantity="other">%d vybraných kol</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d smazané kolo</item>
-    <item quantity="few">%d smazaná kola</item>
-    <item quantity="many">%d smazaných kol</item>
-    <item quantity="other">%d smazaných kol</item>
-  </plurals>
-  <string name="date">Datum</string>
-  <string name="edit_round">Upravit kolo</string>
-  <string name="draw_weight">Síla nátahu</string>
-  <string name="sight">Zaměřovač</string>
-  <string name="limbs">Ramena</string>
-  <string name="my_bow">Můj luk</string>
-  <string name="my_arrow">Moje šípy</string>
-  <string name="tip_weight">Váha hrotu</string>
-  <string name="arrow_ranking">Hodnocení šípu</string>
-  <string name="arrow_x_of_set_of_arrows">Šíp %1$s z %2$s</string>
-  <string name="display">Zobrazit</string>
-  <string name="print">Tisk</string>
-  <string name="table">Tabulka</string>
-  <string name="comments">Komentáře</string>
-  <string name="show_points_colored">Zobrazit body barevně</string>
-  <string name="stabilizer">Stabilizátor</string>
-  <string name="clicker">Klapačka</string>
-  <string name="arrow_number_x">Šíp číslo %s</string>
-  <string name="training_with_standard_round">Trénink - standardní kolo</string>
-  <string name="free_training">Volný trénink</string>
-  <string name="competition">Soutěž</string>
-  <string name="about">O aplikaci</string>
-  <string name="general">Obecné</string>
-  <string name="contribute">Přispět</string>
-  <string name="connect">Připojit</string>
-  <string name="special_thanks_to">Zvláštní poděkování</string>
-  <string name="all_translators">Všichni kluci, kteří pomáhali, překládat aplikaci!</string>
-  <string name="all_beta_testers">Každý, kdo se přidal do skupiny beta testerů a tedy pomáhá neustále zlepšovat aplikaci.</string>
-  <string name="test_beta">Vyzkoušejte nejnovější beta verze</string>
-  <string name="join_on_google_plus">Připojte se k nám na Google +</string>
-  <string name="share_with_friends">Sdílejte s přáteli</string>
-  <string name="donate">Podpořit</string>
-  <string name="donate_via_paypal">Podpořit přes PayPal</string>
-  <string name="translate_crowdin">Přeložit na Crowdin</string>
-  <string name="network_linkedin">Síť na LinkedIn</string>
-  <string name="search">Hledat</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Celý trénink</string>
-  <string name="show_shots_round">Aktuální kolo</string>
-  <string name="show_shots_end">Aktuální sada</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Narozeniny</string>
-  <string name="first_name">Křestní Jméno</string>
-  <string name="last_name">Příjmení</string>
-  <string name="age">Věk</string>
-  <string name="show_signature">Podpis</string>
-  <string name="archer">Střelec</string>
-  <string name="hits">Zásahy</string>
-  <string name="misses">Minuto</string>
-  <string name="new_end">Nová sada</string>
-  <string name="distribution">Souhrn</string>
-  <string name="count">Počet</string>
-  <string name="diameter">Průměr</string>
-  <string name="input">Vstup</string>
-  <string name="target_zoom">Násobek zvětšení terče</string>
-  <string name="action_pdf">Exportovat do PDF</string>
-  <string name="arrow_diameter_scale">Zvětšení průměru šípu</string>
-  <string name="timestamp">Časové razítko</string>
-  <string name="change_target_face">Změnit typ terče</string>
-  <string name="your_first_training">Váš první trénink</string>
-  <string name="grouping">Seskupení</string>
-  <string name="show_clusters">Shluky</string>
-  <string name="first_training_description">Klepněte na plus, pro začátek nového tréninku.</string>
-  <string name="show_average">Průměr</string>
-  <string name="show_none">Prázdné</string>
-  <string name="left_handed">Pro leváky</string>
-  <string name="right_handed">Pro praváky</string>
-  <string name="keyboard">Klávesnice</string>
-  <string name="backup_drive_desc">Zálohování dat vám umožní obnovit vaše tréninky v případě, že jste ztratili nebo změnili telefon.</string>
-  <string name="backup_now">Vytvořit zálohu</string>
-  <string name="last_backup">Poslední záloha: %s</string>
-  <string name="recent_backups">Poslední zálohy</string>
-  <string name="dialog_restore_title">Návrat k předchozí verzi</string>
-  <string name="restore_desc">Obnovení dat ze zálohy přepíše všechna existující data.</string>
-  <string name="backup_details">Podrobnosti zálohy</string>
-  <string name="restore">Obnovit</string>
-  <string name="backup_location">Umístění záloh</string>
-  <string name="internal_storage">Vnitřní úložiště</string>
-  <string name="automatic_backup">Automatická záloha</string>
-  <string name="restoring">Obnovení zálohy…</string>
-  <string name="restore_failed">Obnovení selhalo</string>
-  <string name="delete_failed">Odstranění selhalo</string>
-  <string name="backup_restore_desc">Záloha a obnovení dat aplikace</string>
-  <string name="exporting">Exportování…</string>
-  <string name="loading_backups_failed">Načtení zálohy selhalo!</string>
-  <string name="external_storage">Externí úložiště</string>
-  <string name="backup_interval">Plán zálohování</string>
-  <string name="daily">Denně</string>
-  <string name="weekly">Týdně</string>
-  <string name="monthly">Měsíčně</string>
-  <string name="connection_failed">Připojení selhalo!</string>
-  <string name="shooting_indoor">Halové střílení</string>
-  <string name="bow_rest_vertical_position">Svislá pozice</string>
-  <string name="bow_rest">Zakládka</string>
-  <string name="bow_rest_horizontal_position">Vodorovná pozice</string>
-  <string name="bow_cam_settings">Nastavení foťáku</string>
-  <string name="bow_letoff_weight">Celková váha</string>
-  <string name="bow_nocking_point">Sedlo končíku</string>
-  <string name="bow_string">Tětiva</string>
-  <string name="bow_scope_magnification">Rozsah zvětšení</string>
-  <string name="bow_rest_stiffness">Tuhost</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">Další podrobnosti</string>
-  <string name="recently_used">Poslední použité</string>
-  <string name="intro_title_track_training_progress">Zapomeňte na papírovou výsledkovou listinu!</string>
-  <string name="intro_description_track_training_progress">S přesným průměrem zásahů,\nzískáte více užitečných informací\nz vašeho tréninku.</string>
-  <string name="intro_title_everything_in_one_place">Vše, co potřebujete\nna jednom místě</string>
-  <string name="intro_description_everything_in_one_place">Včetně nastavení luku,\nšípu a zaměřovače,\nlukostřelecké časomíry, statistiky \na mnoho dalšího…</string>
-  <string name="average_arrow_score_per_end">Průměr zásahů na sadu</string>
-  <string name="show_end">Zobrazit sadu</string>
-  <string name="show_round">Zobrazit kolo</string>
-  <string name="show_training">Zobrazit trénink</string>
-  <string name="summary">Celkem</string>
-  <string name="end">Sada</string>
-  <string name="average_of">Průměr</string>
-  <string name="displayed_shots">Zobrazené výstřely</string>
-  <string name="invalid_decimal_number">Neplatné desetinné číslo</string>
-  <string name="not_within_expected_range_mm">Není v předpokládaném rozmezí 1 až 20 mm</string>
-  <string name="not_within_expected_range_inch">Není v předpokládaném rozmezí 0 až 1 palce</string>
-  <string name="next_round">Další kolo</string>
-  <string name="previous_round">Předchozí kolo</string>
-  <string name="overview">Přehled</string>
-  <string name="score">Body</string>
-  <string name="show_reached_score">Zobrazit dosažené skóre</string>
-  <string name="show_total_score">Zobrazit maximální skóre</string>
-  <string name="show_percentage">Zobrazit procenta</string>
-  <string name="show_arrow_average">Zobrazit průměr na šíp</string>
-  <string name="image_deleted">Obrázek smazán</string>
-  <string name="delete_image">Smazat obrázek?</string>
-  <string name="keyboard_type">Typ klávesnice</string>
-  <string name="keyboard_enabled">Zapnout klávesnici</string>
-  <string name="sort_shots">Třídění zásahů</string>
-  <string name="sort_shots_for_spots">Řazení zásahů dle typu terče</string>
-  <string name="target_captain">Terčový rozhodčí</string>
-  <string name="language">Jazyk</string>
-  <string name="warning_backup_experimental">Upozornění: Tato funkce je stále experimentální! Prosím, zkontrolujte pravidelně, jestli byla záloha skutečně úspěšná!</string>
-  <string name="drawer_open">Otevřít navigační panel</string>
-  <string name="drawer_close">Zavřít navigační panel</string>
-  <string name="help">Nápověda</string>
-  <string name="home">Domů</string>
-  <string name="click_to_enter_profile">Kliknutím upravíte profil</string>
-  <string name="no_trainings">Zatím nemáte žádný trénink!</string>
-  <string name="no_bows">Žádné luky</string>
-  <string name="no_arrows">Žádné šípy</string>
-  <string name="version_info">Informace o verzi</string>
-  <string name="version_prefix">Verze</string>
-  <string name="max_arrow_number">Nejvyšší číslo šípu</string>
-  <string name="distances">Vzdálenost</string>
-  <string name="diameters">Průměry</string>
-  <string name="bows">Luky</string>
-  <string name="reset">Výchozí</string>
-  <string name="end_x_of_y">Sada %1$d/%2$d</string>
-  <string name="round_x_of_y">Kolo %1$d/%2$d</string>
-  <string name="settings_summary_timer">Nastavte chování lukostřeleckého časovače</string>
-  <string name="settings_summary_scoreboard">Změňit vzhled výsledkové tabulky</string>
-  <string name="settings_summary_input">Přizpůsobit vstupní obrazovku</string>
-  <string name="settings_summary_overview">Přizpůsobit zobrazené informace pro tréninky, kola a sady</string>
-  <string name="settings_summary_profile">Zadejte osobní údaje</string>
-  <string name="licence_number">Číslo licence</string>
-  <string name="file_type">Typ souboru</string>
-  <string name="clear">Vymazat</string>
-  <string name="tap_to_sign">Klepnutím podepíšete</string>
-  <string name="pdf_file">PDF soubor</string>
-  <string name="image_file">Soubor s obrázkem</string>
-  <string name="settings_summary_statistics">Nastavte obrazovku statistik</string>
-  <string name="settings_statistics_spots_to_single_target">Agregované body k jednomu terči</string>
-  <string name="keep_above_lockscreen">Nad zamykací obrazovkou</string>
-  <string name="scoreboard_title_all_rounds">Všechny kola</string>
-  <string name="permission_required">Požadováno oprávnění</string>
-  <string name="backup_permission_explanation"><![CDATA[Aby bylo možné vytvořit zálohu vašich dat, potřebuje aplikace oprávnění k přístupu k vnitřní paměti telefonu. Chcete-li použít funkci zálohování přejděte do nastavení systému > Aplikace > MyTargets > Oprávnění a povolit vstup \'Úložiště\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Možnosti</string>
+    <string name="settings">Nastavení</string>
+    <string name="prev">Předchozí</string>
+    <string name="next">Další</string>
+    <string name="save">Uložit</string>
+    <string name="custom">Vlastní</string>
+    <string name="training">Trénink</string>
+    <string name="bow">Luk</string>
+    <string name="arrow">Šíp</string>
+    <string name="round">Kolo</string>
+    <string name="points">Bodů</string>
+    <string name="passe">Sada</string>
+    <!-- Overview -->
+    <string name="new_training">Nový trénink</string>
+    <string name="new_bow">Nový luk</string>
+    <string name="new_arrow">Nový šíp</string>
+    <string name="new_round">Nové kolo</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d vybraný trénink</item>
+        <item quantity="few">%d vybrané tréninky</item>
+        <item quantity="many">%d vybraných tréninků</item>
+        <item quantity="other">%d vybraných tréninků</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d vybraný luk</item>
+        <item quantity="few">%d vybrané luky</item>
+        <item quantity="many">%d vybraných luků</item>
+        <item quantity="other">%d vybraných luků</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d vybraný šíp</item>
+        <item quantity="few">%d vybrané šípy</item>
+        <item quantity="many">%d vybraných šípů</item>
+        <item quantity="other">%d vybraných šípů</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d vybraná sada</item>
+        <item quantity="few">%d vybrané sady</item>
+        <item quantity="many">%d vybraných sad</item>
+        <item quantity="other">%d vybraných sad</item>
+    </plurals>
+    <string name="edit">Upravit</string>
+    <string name="delete">Odstranit</string>
+    <string name="statistic">Statistiky</string>
+    <!-- Share -->
+    <string name="share">Sdílet</string>
+    <string name="dispersion_pattern">Rozptylový vzor</string>
+    <string name="sharing_failed">Sdílení se nezdařilo!</string>
+    <!-- Export -->
+    <string name="send_exported">Odeslat exportovaná data</string>
+    <string name="exporting_failed">Export se nezdařil!</string>
+    <!-- New bow -->
+    <string name="add_bow">Přidat luk</string>
+    <string name="name">Jméno</string>
+    <string name="bow_type">Typ luku</string>
+    <string name="properties">Vlastnosti</string>
+    <string name="brand">Značka</string>
+    <string name="size">Velikost</string>
+    <string name="description">Popis</string>
+    <string name="height">Výška tětivy</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Nastavení zaměřovače</string>
+    <string name="add">Přidat</string>
+    <string name="take_picture">Vyfotit obrázek</string>
+    <string name="pick_from_gallery">Vyber obrázek z galerie</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Přidat šip</string>
+    <string name="length">Délka</string>
+    <string name="spine">Tvrdost</string>
+    <string name="weight">Hmotnost</string>
+    <string name="vanes">Letky</string>
+    <string name="nock">Končík</string>
+    <string name="material">Materiál</string>
+    <!-- New round -->
+    <string name="title">Název</string>
+    <string name="outdoor">Venkovní</string>
+    <string name="indoor">Vnitřní</string>
+    <string name="distance">Vzdálenost</string>
+    <string name="format">Formát</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d sada</item>
+        <item quantity="few">%d sady</item>
+        <item quantity="many">%d sad</item>
+        <item quantity="other">%d sad</item>
+    </plurals>
+    <string name="with">z</string>
+    <plurals name="arrow">
+        <item quantity="one">%d šíp</item>
+        <item quantity="few">%d šípy</item>
+        <item quantity="many">%d šípů</item>
+        <item quantity="other">%d šípů</item>
+    </plurals>
+    <string name="target_face">Typ terče</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Tabulka výsledků</string>
+    <string name="arrows">Šípy</string>
+    <string name="sum">Součet</string>
+    <string name="carry">Celkem</string>
+    <string name="action_print">Tisk</string>
+    <string name="average">Průměr</string>
+    <!-- Input mode -->
+    <string name="comment">Komentář</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Vybrat soubor</string>
+    <string name="dir_not_created">Nelze vytvořit adresář!</string>
+    <string name="import_failed">Import se nezdařil!</string>
+    <string name="file_not_found">Soubor nenalezen!</string>
+    <string name="failed_reading_file">Selhalo načtení souboru!</string>
+    <!-- Donate -->
+    <string name="donate_2">Přispět na hamburgr</string>
+    <string name="donate_5">Přispět na kebab</string>
+    <string name="donate_10">Přispět na velkou pizzu</string>
+    <string name="donate_20">Přispět na nějaké palivo</string>
+    <string name="donation_thank">Děkuji vám za vaši podporu!</string>
+    <string name="donate_text" formatted="false">Částky jsou včetně DPH a 30% poplatku Googlu. Také můžete přispět na PayPal účet dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Časomíra</string>
+    <string name="touch_to_start">Stiskem spustit</string>
+    <string name="preparation">Připrav se</string>
+    <string name="shooting">Střelba</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Čas střelby</string>
+    <string name="timer_waiting_time">Čas přípravy</string>
+    <string name="timer_warning_time">Čas výstrahy</string>
+    <string name="timer_sound">Zvuk</string>
+    <string name="timer_vibrate">Vibrace</string>
+    <!-- Settings -->
+    <string name="backup_action">Zálohovat</string>
+    <string name="import_action">Importovat</string>
+    <string name="exports_as_csv">Exportovat jako csv</string>
+    <string name="licences">Licence Open-Source</string>
+    <string name="licences_summary">Právní poznámky k licencím</string>
+    <string name="version">Verze %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekunda</item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="many">%d sekund</item>
+        <item quantity="other">%d sekund</item>
+    </plurals>
+    <string name="info">Informace</string>
+    <string name="data">Data</string>
+    <string name="weather">Počasí</string>
+    <string name="environment">Prostředí</string>
+    <string name="wind_speed">Rychlost větru</string>
+    <string name="wind_direction">Směr větru</string>
+    <string name="sight_setting_removed">Nastavení zaměřovače smazané!</string>
+    <string name="metric">Metrické</string>
+    <string name="imperial">Imperiální</string>
+    <string name="undo">Vrátit zpět</string>
+    <string name="standard_rounds">Standardní kola</string>
+    <string name="expand_collapse">Rozbalit/Sbalit</string>
+    <string name="new_round_template">Nová šablona</string>
+    <string name="arrow_numbers">Čísla šípů</string>
+    <string name="round_removed">Kolo smazáno!</string>
+    <string name="custom_round">Vlastní kolo</string>
+    <string name="filter">Filtr</string>
+    <string name="club">Klub</string>
+    <string name="target">Terč</string>
+    <string name="standard_round">Standardní kolo</string>
+    <string name="use_as_template">Použít jako šablonu?</string>
+    <string name="create_copy">Toto je standardní kolo!\nChcete vytvořit kopii, abyste ho mohli upravovat?</string>
+    <string name="practice">Cvičení</string>
+    <string name="edit_training">Upravit trénink</string>
+    <string name="edit_standard_round">Upravit standardní kolo</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d smazaný šíp</item>
+        <item quantity="few">%d smazané šípy</item>
+        <item quantity="many">%d smazaných šípů</item>
+        <item quantity="other">%d smazaných šípů</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d smazaný luk</item>
+        <item quantity="few">%d smazané luky</item>
+        <item quantity="many">%d smazaných luků</item>
+        <item quantity="other">%d smazaných luků</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d smazaný trénink</item>
+        <item quantity="few">%d smazané tréninky</item>
+        <item quantity="many">%d smazaných tréninků</item>
+        <item quantity="other">%d smazaných tréninků</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d smazaná sada</item>
+        <item quantity="few">%d smazané sady</item>
+        <item quantity="many">%d smazaných sad</item>
+        <item quantity="other">%d smazaných sad</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Kolo %d</item>
+        <item quantity="few">Kolo %d</item>
+        <item quantity="many">Kolo %d</item>
+        <item quantity="other">Kolo %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d vybrané kolo</item>
+        <item quantity="few">%d vybraná kola</item>
+        <item quantity="many">%d vybraných kol</item>
+        <item quantity="other">%d vybraných kol</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d smazané kolo</item>
+        <item quantity="few">%d smazaná kola</item>
+        <item quantity="many">%d smazaných kol</item>
+        <item quantity="other">%d smazaných kol</item>
+    </plurals>
+    <string name="date">Datum</string>
+    <string name="edit_round">Upravit kolo</string>
+    <string name="draw_weight">Síla nátahu</string>
+    <string name="sight">Zaměřovač</string>
+    <string name="limbs">Ramena</string>
+    <string name="my_bow">Můj luk</string>
+    <string name="my_arrow">Moje šípy</string>
+    <string name="tip_weight">Váha hrotu</string>
+    <string name="arrow_ranking">Hodnocení šípu</string>
+    <string name="arrow_x_of_set_of_arrows">Šíp %1$s z %2$s</string>
+    <string name="display">Zobrazit</string>
+    <string name="print">Tisk</string>
+    <string name="table">Tabulka</string>
+    <string name="comments">Komentáře</string>
+    <string name="show_points_colored">Zobrazit body barevně</string>
+    <string name="stabilizer">Stabilizátor</string>
+    <string name="clicker">Klapačka</string>
+    <string name="arrow_number_x">Šíp číslo %s</string>
+    <string name="training_with_standard_round">Trénink - standardní kolo</string>
+    <string name="free_training">Volný trénink</string>
+    <string name="competition">Soutěž</string>
+    <string name="about">O aplikaci</string>
+    <string name="general">Obecné</string>
+    <string name="contribute">Přispět</string>
+    <string name="connect">Připojit</string>
+    <string name="special_thanks_to">Zvláštní poděkování</string>
+    <string name="all_translators">Všichni kluci, kteří pomáhali, překládat aplikaci!</string>
+    <string name="all_beta_testers">Každý, kdo se přidal do skupiny beta testerů a tedy pomáhá neustále zlepšovat aplikaci.</string>
+    <string name="test_beta">Vyzkoušejte nejnovější beta verze</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Sdílejte s přáteli</string>
+    <string name="donate">Podpořit</string>
+    <string name="donate_via_paypal">Podpořit přes PayPal</string>
+    <string name="translate_crowdin">Přeložit na Crowdin</string>
+    <string name="network_linkedin">Síť na LinkedIn</string>
+    <string name="search">Hledat</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Celý trénink</string>
+    <string name="show_shots_round">Aktuální kolo</string>
+    <string name="show_shots_end">Aktuální sada</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Narozeniny</string>
+    <string name="first_name">Křestní Jméno</string>
+    <string name="last_name">Příjmení</string>
+    <string name="age">Věk</string>
+    <string name="show_signature">Podpis</string>
+    <string name="archer">Střelec</string>
+    <string name="hits">Zásahy</string>
+    <string name="misses">Minuto</string>
+    <string name="new_end">Nová sada</string>
+    <string name="distribution">Souhrn</string>
+    <string name="count">Počet</string>
+    <string name="diameter">Průměr</string>
+    <string name="input">Vstup</string>
+    <string name="target_zoom">Násobek zvětšení terče</string>
+    <string name="action_pdf">Exportovat do PDF</string>
+    <string name="arrow_diameter_scale">Zvětšení průměru šípu</string>
+    <string name="timestamp">Časové razítko</string>
+    <string name="change_target_face">Změnit typ terče</string>
+    <string name="your_first_training">Váš první trénink</string>
+    <string name="grouping">Seskupení</string>
+    <string name="show_clusters">Shluky</string>
+    <string name="first_training_description">Klepněte na plus, pro začátek nového tréninku.</string>
+    <string name="show_average">Průměr</string>
+    <string name="show_none">Prázdné</string>
+    <string name="left_handed">Pro leváky</string>
+    <string name="right_handed">Pro praváky</string>
+    <string name="keyboard">Klávesnice</string>
+    <string name="backup_drive_desc">Zálohování dat vám umožní obnovit vaše tréninky v případě, že jste ztratili nebo změnili telefon.</string>
+    <string name="backup_now">Vytvořit zálohu</string>
+    <string name="last_backup">Poslední záloha: %s</string>
+    <string name="recent_backups">Poslední zálohy</string>
+    <string name="dialog_restore_title">Návrat k předchozí verzi</string>
+    <string name="restore_desc">Obnovení dat ze zálohy přepíše všechna existující data.</string>
+    <string name="backup_details">Podrobnosti zálohy</string>
+    <string name="restore">Obnovit</string>
+    <string name="backup_location">Umístění záloh</string>
+    <string name="internal_storage">Vnitřní úložiště</string>
+    <string name="automatic_backup">Automatická záloha</string>
+    <string name="restoring">Obnovení zálohy…</string>
+    <string name="restore_failed">Obnovení selhalo</string>
+    <string name="delete_failed">Odstranění selhalo</string>
+    <string name="backup_restore_desc">Záloha a obnovení dat aplikace</string>
+    <string name="exporting">Exportování…</string>
+    <string name="loading_backups_failed">Načtení zálohy selhalo!</string>
+    <string name="external_storage">Externí úložiště</string>
+    <string name="backup_interval">Plán zálohování</string>
+    <string name="daily">Denně</string>
+    <string name="weekly">Týdně</string>
+    <string name="monthly">Měsíčně</string>
+    <string name="connection_failed">Připojení selhalo!</string>
+    <string name="shooting_indoor">Halové střílení</string>
+    <string name="bow_rest_vertical_position">Svislá pozice</string>
+    <string name="bow_rest">Zakládka</string>
+    <string name="bow_rest_horizontal_position">Vodorovná pozice</string>
+    <string name="bow_cam_settings">Nastavení foťáku</string>
+    <string name="bow_letoff_weight">Celková váha</string>
+    <string name="bow_nocking_point">Sedlo končíku</string>
+    <string name="bow_string">Tětiva</string>
+    <string name="bow_scope_magnification">Rozsah zvětšení</string>
+    <string name="bow_rest_stiffness">Tuhost</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">Další podrobnosti</string>
+    <string name="recently_used">Poslední použité</string>
+    <string name="intro_title_track_training_progress">Zapomeňte na papírovou výsledkovou listinu!</string>
+    <string name="intro_description_track_training_progress">S přesným průměrem zásahů,\nzískáte více užitečných informací\nz vašeho tréninku.</string>
+    <string name="intro_title_everything_in_one_place">Vše, co potřebujete\nna jednom místě</string>
+    <string name="intro_description_everything_in_one_place">Včetně nastavení luku,\nšípu a zaměřovače,\nlukostřelecké časomíry, statistiky \na mnoho dalšího…</string>
+    <string name="average_arrow_score_per_end">Průměr zásahů na sadu</string>
+    <string name="show_end">Zobrazit sadu</string>
+    <string name="show_round">Zobrazit kolo</string>
+    <string name="show_training">Zobrazit trénink</string>
+    <string name="summary">Celkem</string>
+    <string name="end">Sada</string>
+    <string name="average_of">Průměr</string>
+    <string name="displayed_shots">Zobrazené výstřely</string>
+    <string name="invalid_decimal_number">Neplatné desetinné číslo</string>
+    <string name="not_within_expected_range_mm">Není v předpokládaném rozmezí 1 až 20 mm</string>
+    <string name="not_within_expected_range_inch">Není v předpokládaném rozmezí 0 až 1 palce</string>
+    <string name="next_round">Další kolo</string>
+    <string name="previous_round">Předchozí kolo</string>
+    <string name="overview">Přehled</string>
+    <string name="score">Body</string>
+    <string name="show_reached_score">Zobrazit dosažené skóre</string>
+    <string name="show_total_score">Zobrazit maximální skóre</string>
+    <string name="show_percentage">Zobrazit procenta</string>
+    <string name="show_arrow_average">Zobrazit průměr na šíp</string>
+    <string name="image_deleted">Obrázek smazán</string>
+    <string name="delete_image">Smazat obrázek?</string>
+    <string name="keyboard_type">Typ klávesnice</string>
+    <string name="keyboard_enabled">Zapnout klávesnici</string>
+    <string name="sort_shots">Třídění zásahů</string>
+    <string name="sort_shots_for_spots">Řazení zásahů dle typu terče</string>
+    <string name="target_captain">Terčový rozhodčí</string>
+    <string name="language">Jazyk</string>
+    <string name="warning_backup_experimental">Upozornění: Tato funkce je stále experimentální! Prosím, zkontrolujte pravidelně, jestli byla záloha skutečně úspěšná!</string>
+    <string name="drawer_open">Otevřít navigační panel</string>
+    <string name="drawer_close">Zavřít navigační panel</string>
+    <string name="help">Nápověda</string>
+    <string name="home">Domů</string>
+    <string name="click_to_enter_profile">Kliknutím upravíte profil</string>
+    <string name="no_trainings">Zatím nemáte žádný trénink!</string>
+    <string name="no_bows">Žádné luky</string>
+    <string name="no_arrows">Žádné šípy</string>
+    <string name="version_info">Informace o verzi</string>
+    <string name="version_prefix">Verze</string>
+    <string name="max_arrow_number">Nejvyšší číslo šípu</string>
+    <string name="distances">Vzdálenost</string>
+    <string name="diameters">Průměry</string>
+    <string name="bows">Luky</string>
+    <string name="reset">Výchozí</string>
+    <string name="end_x_of_y">Sada %1$d/%2$d</string>
+    <string name="round_x_of_y">Kolo %1$d/%2$d</string>
+    <string name="settings_summary_timer">Nastavte chování lukostřeleckého časovače</string>
+    <string name="settings_summary_scoreboard">Změňit vzhled výsledkové tabulky</string>
+    <string name="settings_summary_input">Přizpůsobit vstupní obrazovku</string>
+    <string name="settings_summary_overview">Přizpůsobit zobrazené informace pro tréninky, kola a sady</string>
+    <string name="settings_summary_profile">Zadejte osobní údaje</string>
+    <string name="licence_number">Číslo licence</string>
+    <string name="file_type">Typ souboru</string>
+    <string name="clear">Vymazat</string>
+    <string name="tap_to_sign">Klepnutím podepíšete</string>
+    <string name="pdf_file">PDF soubor</string>
+    <string name="image_file">Soubor s obrázkem</string>
+    <string name="settings_summary_statistics">Nastavte obrazovku statistik</string>
+    <string name="settings_statistics_spots_to_single_target">Agregované body k jednomu terči</string>
+    <string name="keep_above_lockscreen">Nad zamykací obrazovkou</string>
+    <string name="scoreboard_title_all_rounds">Všechny kola</string>
+    <string name="permission_required">Požadováno oprávnění</string>
+    <string name="backup_permission_explanation"><![CDATA[Aby bylo možné vytvořit zálohu vašich dat, potřebuje aplikace oprávnění k přístupu k vnitřní paměti telefonu. Chcete-li použít funkci zálohování přejděte do nastavení systému > Aplikace > MyTargets > Oprávnění a povolit vstup \'Úložiště\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 4bdc8697c..e1482d2f3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Indstillinger</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Forrige</string>
-  <string name="next">Næste</string>
-  <string name="save">Gem</string>
-  <string name="custom">Brugerdefineret</string>
-  <string name="training">Træning</string>
-  <string name="bow">Bue</string>
-  <string name="arrow">Pil</string>
-  <string name="round">Runde</string>
-  <string name="points">Point</string>
-  <string name="passe">Afslut</string>
-  <!-- Overview -->
-  <string name="new_training">Ny træning</string>
-  <string name="new_bow">Nye bue</string>
-  <string name="new_arrow">Ny pil</string>
-  <string name="new_round">Ny runde</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d træning valgt</item>
-    <item quantity="other">%d træninger valgt</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bue valgt</item>
-    <item quantity="other">%d buer valgt</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d pil valgt</item>
-    <item quantity="other">%d pile valgt</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d ende valgt</item>
-    <item quantity="other">%d ender valgt</item>
-  </plurals>
-  <string name="edit">Rediger</string>
-  <string name="delete">Slet</string>
-  <string name="statistic">Statistik</string>
-  <!-- Share -->
-  <string name="share">Del</string>
-  <string name="dispersion_pattern">Afvigelsesmønster</string>
-  <string name="sharing_failed">Deling mislykkedes!</string>
-  <!-- Export -->
-  <string name="send_exported">Send eksporterede data</string>
-  <string name="exporting_failed">Eksportering mislykkedes!</string>
-  <!-- New bow -->
-  <string name="add_bow">Tilføje bue</string>
-  <string name="name">Navn</string>
-  <string name="bow_type">Bue type</string>
-  <string name="properties">Egenskaber</string>
-  <string name="brand">Mærke</string>
-  <string name="size">Størrelse</string>
-  <string name="description">Beskrivelse</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sigtemærker</string>
-  <string name="add">Tilføj</string>
-  <string name="take_picture">Tag et billede</string>
-  <string name="pick_from_gallery">Vælg et billede fra Galleri</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Tilføj pil</string>
-  <string name="length">Længde</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Vægt</string>
-  <string name="vanes">Faner</string>
-  <string name="nock">Nock</string>
-  <string name="material">Materiale</string>
-  <!-- New round -->
-  <string name="title">Titel</string>
-  <string name="outdoor">Udendørs</string>
-  <string name="indoor">Indendørs</string>
-  <string name="distance">Afstand</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d runde</item>
-    <item quantity="other">%d runder</item>
-  </plurals>
-  <string name="with">af</string>
-  <plurals name="arrow">
-    <item quantity="one">%d pil</item>
-    <item quantity="other">%d pile</item>
-  </plurals>
-  <string name="target_face">Ansigt</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Resultattavle</string>
-  <string name="arrows">Pile</string>
-  <string name="sum">Point</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Udskriv</string>
-  <string name="average">Gennemsnit</string>
-  <!-- Input mode -->
-  <string name="comment">Kommentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Vælg en fil</string>
-  <string name="dir_not_created">Mappen kunne ikke oprettes!</string>
-  <string name="import_failed">Import mislykkedes!</string>
-  <string name="file_not_found">Filen findes ikke!</string>
-  <string name="failed_reading_file">Fejl i læsning af fil!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donér mig en burger</string>
-  <string name="donate_5">Donér mig en kebab</string>
-  <string name="donate_10">Donèr mig en stor pizza</string>
-  <string name="donate_20">Donér mig noget brændstof</string>
-  <string name="donation_thank">Tak for din støtte!</string>
-  <string name="donate_text" formatted="false">Beløbene er incl. moms og 30% gebyrer til Google. Alternativt kan du donere på PayPal konto dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Tryk for at starte</string>
-  <string name="preparation">Gør dig klar</string>
-  <string name="shooting">Skydning</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Skydetid</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Advarselstid</string>
-  <string name="timer_sound">Lyd</string>
-  <string name="timer_vibrate">vibrér</string>
-  <!-- Settings -->
-  <string name="backup_action">Sikkerhedskopi</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source Licenser</string>
-  <string name="licences_summary">Juridiske bemærkninger til licenser</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekund</item>
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <string name="info">Oplysninger</string>
-  <string name="data">Data</string>
-  <string name="weather">Vejr</string>
-  <string name="environment">Omgivelser</string>
-  <string name="wind_speed">Vindhastighed</string>
-  <string name="wind_direction">Vindretning</string>
-  <string name="sight_setting_removed">Sigte indstilling slettet!</string>
-  <string name="metric">Metrisk</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Fortryd</string>
-  <string name="standard_rounds">Standard runder</string>
-  <string name="expand_collapse">Udvid/skjul</string>
-  <string name="new_round_template">Ny skabelon</string>
-  <string name="arrow_numbers">Pile numre</string>
-  <string name="round_removed">Runde slettet!</string>
-  <string name="custom_round">Tilpasset runde</string>
-  <string name="filter">Filter</string>
-  <string name="club">Klub</string>
-  <string name="target">Mål</string>
-  <string name="standard_round">Standard runde</string>
-  <string name="use_as_template">Brug som skabelon?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Netværk på LinkedIn</string>
-  <string name="search">Søg</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Al træning</string>
-  <string name="show_shots_round">Aktuelle runde</string>
-  <string name="show_shots_end">Nuværende runde</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Fødselsdato</string>
-  <string name="first_name">Fornavn</string>
-  <string name="last_name">Efternavn</string>
-  <string name="age">Alder</string>
-  <string name="show_signature">Underskrift</string>
-  <string name="archer">Skytte</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Forbiere</string>
-  <string name="new_end">Nye runde</string>
-  <string name="distribution">Deling</string>
-  <string name="count">Antal</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoomniveau</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Pil diameter skala</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Afslut %1$d/%2$d</string>
-  <string name="round_x_of_y">Runde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Indstillinger</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Forrige</string>
+    <string name="next">Næste</string>
+    <string name="save">Gem</string>
+    <string name="custom">Brugerdefineret</string>
+    <string name="training">Træning</string>
+    <string name="bow">Bue</string>
+    <string name="arrow">Pil</string>
+    <string name="round">Runde</string>
+    <string name="points">Point</string>
+    <string name="passe">Afslut</string>
+    <!-- Overview -->
+    <string name="new_training">Ny træning</string>
+    <string name="new_bow">Nye bue</string>
+    <string name="new_arrow">Ny pil</string>
+    <string name="new_round">Ny runde</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d træning valgt</item>
+        <item quantity="other">%d træninger valgt</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bue valgt</item>
+        <item quantity="other">%d buer valgt</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d pil valgt</item>
+        <item quantity="other">%d pile valgt</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d ende valgt</item>
+        <item quantity="other">%d ender valgt</item>
+    </plurals>
+    <string name="edit">Rediger</string>
+    <string name="delete">Slet</string>
+    <string name="statistic">Statistik</string>
+    <!-- Share -->
+    <string name="share">Del</string>
+    <string name="dispersion_pattern">Afvigelsesmønster</string>
+    <string name="sharing_failed">Deling mislykkedes!</string>
+    <!-- Export -->
+    <string name="send_exported">Send eksporterede data</string>
+    <string name="exporting_failed">Eksportering mislykkedes!</string>
+    <!-- New bow -->
+    <string name="add_bow">Tilføje bue</string>
+    <string name="name">Navn</string>
+    <string name="bow_type">Bue type</string>
+    <string name="properties">Egenskaber</string>
+    <string name="brand">Mærke</string>
+    <string name="size">Størrelse</string>
+    <string name="description">Beskrivelse</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sigtemærker</string>
+    <string name="add">Tilføj</string>
+    <string name="take_picture">Tag et billede</string>
+    <string name="pick_from_gallery">Vælg et billede fra Galleri</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Tilføj pil</string>
+    <string name="length">Længde</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Vægt</string>
+    <string name="vanes">Faner</string>
+    <string name="nock">Nock</string>
+    <string name="material">Materiale</string>
+    <!-- New round -->
+    <string name="title">Titel</string>
+    <string name="outdoor">Udendørs</string>
+    <string name="indoor">Indendørs</string>
+    <string name="distance">Afstand</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d runde</item>
+        <item quantity="other">%d runder</item>
+    </plurals>
+    <string name="with">af</string>
+    <plurals name="arrow">
+        <item quantity="one">%d pil</item>
+        <item quantity="other">%d pile</item>
+    </plurals>
+    <string name="target_face">Ansigt</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Resultattavle</string>
+    <string name="arrows">Pile</string>
+    <string name="sum">Point</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Udskriv</string>
+    <string name="average">Gennemsnit</string>
+    <!-- Input mode -->
+    <string name="comment">Kommentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Vælg en fil</string>
+    <string name="dir_not_created">Mappen kunne ikke oprettes!</string>
+    <string name="import_failed">Import mislykkedes!</string>
+    <string name="file_not_found">Filen findes ikke!</string>
+    <string name="failed_reading_file">Fejl i læsning af fil!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donér mig en burger</string>
+    <string name="donate_5">Donér mig en kebab</string>
+    <string name="donate_10">Donèr mig en stor pizza</string>
+    <string name="donate_20">Donér mig noget brændstof</string>
+    <string name="donation_thank">Tak for din støtte!</string>
+    <string name="donate_text" formatted="false">Beløbene er incl. moms og 30% gebyrer til Google. Alternativt kan du donere på PayPal konto dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Tryk for at starte</string>
+    <string name="preparation">Gør dig klar</string>
+    <string name="shooting">Skydning</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Skydetid</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Advarselstid</string>
+    <string name="timer_sound">Lyd</string>
+    <string name="timer_vibrate">vibrér</string>
+    <!-- Settings -->
+    <string name="backup_action">Sikkerhedskopi</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source Licenser</string>
+    <string name="licences_summary">Juridiske bemærkninger til licenser</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <string name="info">Oplysninger</string>
+    <string name="data">Data</string>
+    <string name="weather">Vejr</string>
+    <string name="environment">Omgivelser</string>
+    <string name="wind_speed">Vindhastighed</string>
+    <string name="wind_direction">Vindretning</string>
+    <string name="sight_setting_removed">Sigte indstilling slettet!</string>
+    <string name="metric">Metrisk</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Fortryd</string>
+    <string name="standard_rounds">Standard runder</string>
+    <string name="expand_collapse">Udvid/skjul</string>
+    <string name="new_round_template">Ny skabelon</string>
+    <string name="arrow_numbers">Pile numre</string>
+    <string name="round_removed">Runde slettet!</string>
+    <string name="custom_round">Tilpasset runde</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klub</string>
+    <string name="target">Mål</string>
+    <string name="standard_round">Standard runde</string>
+    <string name="use_as_template">Brug som skabelon?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Netværk på LinkedIn</string>
+    <string name="search">Søg</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Al træning</string>
+    <string name="show_shots_round">Aktuelle runde</string>
+    <string name="show_shots_end">Nuværende runde</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Fødselsdato</string>
+    <string name="first_name">Fornavn</string>
+    <string name="last_name">Efternavn</string>
+    <string name="age">Alder</string>
+    <string name="show_signature">Underskrift</string>
+    <string name="archer">Skytte</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Forbiere</string>
+    <string name="new_end">Nye runde</string>
+    <string name="distribution">Deling</string>
+    <string name="count">Antal</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoomniveau</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Pil diameter skala</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Afslut %1$d/%2$d</string>
+    <string name="round_x_of_y">Runde %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 926a9994a..4dd078f52 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Einstellungen</string>
-  <string name="settings">Einstellungen</string>
-  <string name="prev">Zurück</string>
-  <string name="next">Weiter</string>
-  <string name="save">Speichern</string>
-  <string name="custom">Benutzerdefiniert</string>
-  <string name="training">Training</string>
-  <string name="bow">Bogen</string>
-  <string name="arrow">Pfeil</string>
-  <string name="round">Runde</string>
-  <string name="points">Punkte</string>
-  <string name="passe">Passe</string>
-  <!-- Overview -->
-  <string name="new_training">Neues Training</string>
-  <string name="new_bow">Neuer Bogen</string>
-  <string name="new_arrow">Neuer Pfeil</string>
-  <string name="new_round">Neue Runde</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d Training ausgewählt</item>
-    <item quantity="other">%d Trainings ausgewählt</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d Bogen ausgewählt</item>
-    <item quantity="other">%d Bögen ausgewählt</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d Pfeil ausgewählt</item>
-    <item quantity="other">%d Pfeile ausgewählt</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Eine Passe ausgewählt</item>
-    <item quantity="other">%d Passen ausgewählt</item>
-  </plurals>
-  <string name="edit">Bearbeiten</string>
-  <string name="delete">Löschen</string>
-  <string name="statistic">Statistik</string>
-  <!-- Share -->
-  <string name="share">Teilen</string>
-  <string name="dispersion_pattern">Trefferbild</string>
-  <string name="sharing_failed">Teilen fehlgeschlagen!</string>
-  <!-- Export -->
-  <string name="send_exported">Sende exportierte Daten</string>
-  <string name="exporting_failed">Export fehlgeschlagen!</string>
-  <!-- New bow -->
-  <string name="add_bow">Bogen hinzufügen</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bogenart</string>
-  <string name="properties">Eigenschaften</string>
-  <string name="brand">Marke</string>
-  <string name="size">Größe</string>
-  <string name="description">Beschreibung</string>
-  <string name="height">Standhöhe</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Visiereinstellungen</string>
-  <string name="add">Hinzufügen</string>
-  <string name="take_picture">Neues Foto aufnehmen</string>
-  <string name="pick_from_gallery">Foto aus Galerie auswählen</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Pfeil hinzufügen</string>
-  <string name="length">Länge</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Gewicht</string>
-  <string name="vanes">Befiederung</string>
-  <string name="nock">Nocke</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Titel</string>
-  <string name="outdoor">Draußen</string>
-  <string name="indoor">Halle</string>
-  <string name="distance">Entfernung</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">1 Passe</item>
-    <item quantity="other">%d Passen</item>
-  </plurals>
-  <string name="with">mit</string>
-  <plurals name="arrow">
-    <item quantity="one">einem Pfeil</item>
-    <item quantity="other">%d Pfeilen</item>
-  </plurals>
-  <string name="target_face">Auflage</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Schießzettel</string>
-  <string name="arrows">Pfeile</string>
-  <string name="sum">Summe</string>
-  <string name="carry">Übertrag</string>
-  <string name="action_print">Drucken</string>
-  <string name="average">Schnitt</string>
-  <!-- Input mode -->
-  <string name="comment">Kommentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Wähle eine Datei</string>
-  <string name="dir_not_created">Ordner konnte nicht erstellt werden!</string>
-  <string name="import_failed">Import gescheitert!</string>
-  <string name="file_not_found">Datei nicht gefunden!</string>
-  <string name="failed_reading_file">Fehler beim Einlesen der Datei!</string>
-  <!-- Donate -->
-  <string name="donate_2">Spende mir einen Burger</string>
-  <string name="donate_5">Spende mir einen Döner</string>
-  <string name="donate_10">Spende mir eine große Pizza</string>
-  <string name="donate_20">Spende mir ein bisschen Benzin</string>
-  <string name="donation_thank">Vielen Dank für Ihre Unterstützung!</string>
-  <string name="donate_text" formatted="false">Die Beträge sind inkl. Mehrwertsteuer und 30% Gebühren für Google. Alternativ kannst du mir auch gerne auf das PayPal Konto dreier.florian@gmail.com spenden.</string>
-  <!-- Timer -->
-  <string name="timer">Schießuhr</string>
-  <string name="touch_to_start">Berühren zum starten</string>
-  <string name="preparation">Fertig machen</string>
-  <string name="shooting">Schießen</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Schießzeit</string>
-  <string name="timer_waiting_time">Vorbereitungszeit</string>
-  <string name="timer_warning_time">Gelbphase</string>
-  <string name="timer_sound">Ton</string>
-  <string name="timer_vibrate">Vibration</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Importieren</string>
-  <string name="exports_as_csv">Export als csv</string>
-  <string name="licences">Open Source-Lizenzen</string>
-  <string name="licences_summary">Rechtliche Hinweise zu Lizenzen</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d Sekunde</item>
-    <item quantity="other">%d Sekunden</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Daten</string>
-  <string name="weather">Wetter</string>
-  <string name="environment">Umgebung</string>
-  <string name="wind_speed">Windgeschwindigkeit</string>
-  <string name="wind_direction">Windrichtung</string>
-  <string name="sight_setting_removed">Visier Einstellung gelöscht!</string>
-  <string name="metric">Metrisch</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Rückgängig</string>
-  <string name="standard_rounds">Standardrunden</string>
-  <string name="expand_collapse">Ausklappen/Einklappen</string>
-  <string name="new_round_template">Neue Vorlage</string>
-  <string name="arrow_numbers">Pfeile nummerieren</string>
-  <string name="round_removed">Runde gelöscht!</string>
-  <string name="custom_round">Benutzerdefinierte Runde</string>
-  <string name="filter">Filtern</string>
-  <string name="club">Verein</string>
-  <string name="target">Zielscheibe</string>
-  <string name="standard_round">Standardrunde</string>
-  <string name="use_as_template">Als Vorlage verwenden?</string>
-  <string name="create_copy">Das ist eine Standardrunde!\nWillst du eine Kopie erzeugen um sie bearbeiten zu können?</string>
-  <string name="practice">Übung</string>
-  <string name="edit_training">Training bearbeiten</string>
-  <string name="edit_standard_round">Standardrunde bearbeiten</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">Ein Pfeil gelöscht</item>
-    <item quantity="other">%d Pfeile gelöscht</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">Ein Bogen gelöscht</item>
-    <item quantity="other">%d Bögen gelöscht</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">Ein Training gelöscht</item>
-    <item quantity="other">%d Trainings gelöscht</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">Eine Passe gelöscht</item>
-    <item quantity="other">%d Passen gelöscht</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Runde %d</item>
-    <item quantity="other">Runde %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d Runde ausgewählt</item>
-    <item quantity="other">%d Runden ausgewählt</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d Runde gelöscht</item>
-    <item quantity="other">%d Runden gelöscht</item>
-  </plurals>
-  <string name="date">Datum</string>
-  <string name="edit_round">Runde bearbeiten</string>
-  <string name="draw_weight">Zugkraft</string>
-  <string name="sight">Visier</string>
-  <string name="limbs">Wurfarme</string>
-  <string name="my_bow">Mein Bogen</string>
-  <string name="my_arrow">Mein Pfeil</string>
-  <string name="tip_weight">Spitzengewicht</string>
-  <string name="arrow_ranking">Pfeil-Rangliste</string>
-  <string name="arrow_x_of_set_of_arrows">Pfeil %1$s von %2$s</string>
-  <string name="display">Anzeige</string>
-  <string name="print">Drucken</string>
-  <string name="table">Tabelle</string>
-  <string name="comments">Kommentare</string>
-  <string name="show_points_colored">Ringe farbig anzeigen</string>
-  <string name="stabilizer">Stabilisator</string>
-  <string name="clicker">Klicker</string>
-  <string name="arrow_number_x">Pfeil Nr. %s</string>
-  <string name="training_with_standard_round">Training mit Standard Runde</string>
-  <string name="free_training">Freies Training</string>
-  <string name="competition">Wettkampf</string>
-  <string name="about">Über</string>
-  <string name="general">Allgemein</string>
-  <string name="contribute">Beitragen</string>
-  <string name="connect">Verbinden</string>
-  <string name="special_thanks_to">Besonderen Dank an</string>
-  <string name="all_translators">Alle Leute, die dabei geholfen haben, die App zu übersetzen!</string>
-  <string name="all_beta_testers">Alle, die als Mitglieder der Beta Tester Gruppe dazu beitragen die App kontinuierlich zu verbessern.</string>
-  <string name="test_beta">Die neueste Betaversion testen</string>
-  <string name="join_on_google_plus">Google+-Seite besuchen</string>
-  <string name="share_with_friends">Mit Ihren Freunden teilen</string>
-  <string name="donate">Spenden</string>
-  <string name="donate_via_paypal">Spenden via PayPal</string>
-  <string name="translate_crowdin">Auf Crowdin übersetzen</string>
-  <string name="network_linkedin">Auf LinkedIn vernetzen</string>
-  <string name="search">Suche</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Ganzes Training</string>
-  <string name="show_shots_round">Aktuelle Runde</string>
-  <string name="show_shots_end">Aktuelle Passe</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Geburtsdatum</string>
-  <string name="first_name">Vorname</string>
-  <string name="last_name">Nachname</string>
-  <string name="age">Alter</string>
-  <string name="show_signature">Unterschrift</string>
-  <string name="archer">Bogenschütze</string>
-  <string name="hits">Treffer</string>
-  <string name="misses">Nicht-Treffer</string>
-  <string name="new_end">Neue Passe</string>
-  <string name="distribution">Verteilung</string>
-  <string name="count">Anzahl</string>
-  <string name="diameter">Durchmesser</string>
-  <string name="input">Eingabe</string>
-  <string name="target_zoom">Zoomstufe für Zielscheibe</string>
-  <string name="action_pdf">Als PDF exportieren</string>
-  <string name="arrow_diameter_scale">Pfeildurchmesser Skalierung</string>
-  <string name="timestamp">Uhrzeit</string>
-  <string name="change_target_face">Auflage ändern</string>
-  <string name="your_first_training">Dein erstes Training</string>
-  <string name="grouping">Gruppierung</string>
-  <string name="show_clusters">Gruppen</string>
-  <string name="first_training_description">Tippe auf das Plus um ein neues Training zu starten.</string>
-  <string name="show_average">Durchschnitt</string>
-  <string name="show_none">Nichts</string>
-  <string name="left_handed">Linkshänder</string>
-  <string name="right_handed">Rechtshänder</string>
-  <string name="keyboard">Tastatur</string>
-  <string name="backup_drive_desc">Das Sichern Ihrer Daten ermöglicht es Ihnen, Ihre Trainingsdaten wiederherzustellen, wenn Sie Ihr Gerät verlieren oder durch ein anderes ersetzen.</string>
-  <string name="backup_now">Jetzt sichern</string>
-  <string name="last_backup">Letztes Backup: %s</string>
-  <string name="recent_backups">Letzte Sicherungen</string>
-  <string name="dialog_restore_title">Diese Version wiederherstellen</string>
-  <string name="restore_desc">Durch das Wiederherstellen der Sicherung werden alle vorhandenen Daten überschrieben.</string>
-  <string name="backup_details">Backup-Details</string>
-  <string name="restore">Wiederherstellen</string>
-  <string name="backup_location">Speicherort für Sicherung</string>
-  <string name="internal_storage">Interner Speicher</string>
-  <string name="automatic_backup">Automatische Sicherung</string>
-  <string name="restoring">Sicherung wiederherstellen…</string>
-  <string name="restore_failed">Wiederherstellen fehlgeschlagen</string>
-  <string name="delete_failed">Löschen fehlgeschlagen</string>
-  <string name="backup_restore_desc">Sicherungen erstellen und wiederherstellen</string>
-  <string name="exporting">Exportieren…</string>
-  <string name="loading_backups_failed">Abrufen der Sicherungen fehlgeschlagen!</string>
-  <string name="external_storage">Externe Speicherkarte</string>
-  <string name="backup_interval">Sicherungsintervall</string>
-  <string name="daily">Täglich</string>
-  <string name="weekly">Wöchentlich</string>
-  <string name="monthly">Monatlich</string>
-  <string name="connection_failed">Verbindung fehlgeschlagen!</string>
-  <string name="shooting_indoor">Schießen in der Halle</string>
-  <string name="bow_rest_vertical_position">Vertikale Ausrichtung</string>
-  <string name="bow_rest">Pfeilablage</string>
-  <string name="bow_rest_horizontal_position">Horizontale Ausrichtung</string>
-  <string name="bow_cam_settings">Cam Einstellungen</string>
-  <string name="bow_letoff_weight">Zugkraft beim Loslassen</string>
-  <string name="bow_nocking_point">Nockpunkt</string>
-  <string name="bow_string">Sehne</string>
-  <string name="bow_scope_magnification">Scope Vergrößerung</string>
-  <string name="bow_rest_stiffness">Steifigkeit</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">Weitere Felder</string>
-  <string name="recently_used">Zuletzt verwendet</string>
-  <string name="intro_title_track_training_progress">Vergiss Schießzettel aus Papier!</string>
-  <string name="intro_description_track_training_progress">Durch exakte Pfeilaufnahme\nkannst du nützlichere Erkenntnisse\naus deinen Trainingsdaten gewinnen.</string>
-  <string name="intro_title_everything_in_one_place">Alles was du brauchst\nan einem Ort</string>
-  <string name="intro_description_everything_in_one_place">Einschließlich Bogen-, Pfeil-\nund Visier-Verwaltung, \nSchießuhr, Statistiken \nund vieles mehr…</string>
-  <string name="average_arrow_score_per_end">Ringdurchschnitt pro Passe</string>
-  <string name="show_end">Passe anzeigen</string>
-  <string name="show_round">Runde anzeigen</string>
-  <string name="show_training">Training anzeigen</string>
-  <string name="summary">Zusammenfassung</string>
-  <string name="end">Passe</string>
-  <string name="average_of">Durchschnitt von</string>
-  <string name="displayed_shots">Sichtbare Schüsse</string>
-  <string name="invalid_decimal_number">Ungültige Dezimalzahl</string>
-  <string name="not_within_expected_range_mm">Nicht innerhalb des erwarteten Bereichs von 1 bis 20 mm</string>
-  <string name="not_within_expected_range_inch">Nicht innerhalb des erwarteten Bereichs von 0 bis 1 Zoll</string>
-  <string name="next_round">Nächste Runde</string>
-  <string name="previous_round">Vorherige Runde</string>
-  <string name="overview">Übersicht</string>
-  <string name="score">Punktzahl</string>
-  <string name="show_reached_score">Erreichte Ringzahl anzeigen</string>
-  <string name="show_total_score">Maximal erreichbare Ringzahl anzeigen</string>
-  <string name="show_percentage">Prozent anzeigen</string>
-  <string name="show_arrow_average">Pfeildurchschnitt anzeigen</string>
-  <string name="image_deleted">Bild gelöscht</string>
-  <string name="delete_image">Bild löschen?</string>
-  <string name="keyboard_type">Tastaturtyp</string>
-  <string name="keyboard_enabled">Tastatur aktiviert</string>
-  <string name="sort_shots">Schüsse sortieren</string>
-  <string name="sort_shots_for_spots">Schüsse bei Spot Auflagen sortieren</string>
-  <string name="target_captain">Schreiber</string>
-  <string name="language">Sprache</string>
-  <string name="warning_backup_experimental">Achtung: Dieses Feature ist noch experimentell! Bitte überprüfen Sie in regelmäßigen Abständen, ob die Sicherung erfolgreich war!</string>
-  <string name="drawer_open">Navigationsleiste öffnen</string>
-  <string name="drawer_close">Navigationsleiste schließen</string>
-  <string name="help">Hilfe</string>
-  <string name="home">Startseite</string>
-  <string name="click_to_enter_profile">Tippen um das Profil anzupassen</string>
-  <string name="no_trainings">Du hast noch keine Trainings!</string>
-  <string name="no_bows">Keine Bögen</string>
-  <string name="no_arrows">Keine Pfeile</string>
-  <string name="version_info">Versionsinfo</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Höchste Pfeil-Nummer</string>
-  <string name="distances">Entfernungen</string>
-  <string name="diameters">Durchmesser</string>
-  <string name="bows">Bögen</string>
-  <string name="reset">Zurücksetzen</string>
-  <string name="end_x_of_y">Passe %1$d/%2$d</string>
-  <string name="round_x_of_y">Runde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Verhalten der Schießuhr anpassen</string>
-  <string name="settings_summary_scoreboard">Aussehen des Schießzettels ändern</string>
-  <string name="settings_summary_input">Personalisierung des Eingabe-Bildschirms</string>
-  <string name="settings_summary_overview">Anpassen der angezeigten Infos für Trainings, Runden und Passen</string>
-  <string name="settings_summary_profile">Persönliche Informationen bearbeiten</string>
-  <string name="licence_number">Lizenz-Nummer</string>
-  <string name="file_type">Dateityp</string>
-  <string name="clear">Löschen</string>
-  <string name="tap_to_sign">Tippen zum Unterschreiben</string>
-  <string name="pdf_file">PDF-Datei</string>
-  <string name="image_file">Bild-Datei</string>
-  <string name="settings_summary_statistics">Statistik anpassen</string>
-  <string name="settings_statistics_spots_to_single_target">Fasse Spots zu einer einzigen Zielscheibe zusammen</string>
-  <string name="keep_above_lockscreen">Auf dem Sperrbildschirm anzeigen</string>
-  <string name="scoreboard_title_all_rounds">Alle Runden</string>
-  <string name="permission_required">Berechtigung erforderlich</string>
-  <string name="backup_permission_explanation"><![CDATA[Um ein Backup Ihrer Daten machen zu können, benötigt die App Zugriff auf den internen Speicher des Telefons. Um die Backup Funktion verwenden zu können gehe zu Systemeinstellungen > Apps > MyTargets > Berechtigungen und aktiviere den Eintrag \'Speicher\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Einstellungen</string>
+    <string name="settings">Einstellungen</string>
+    <string name="prev">Zurück</string>
+    <string name="next">Weiter</string>
+    <string name="save">Speichern</string>
+    <string name="custom">Benutzerdefiniert</string>
+    <string name="training">Training</string>
+    <string name="bow">Bogen</string>
+    <string name="arrow">Pfeil</string>
+    <string name="round">Runde</string>
+    <string name="points">Punkte</string>
+    <string name="passe">Passe</string>
+    <!-- Overview -->
+    <string name="new_training">Neues Training</string>
+    <string name="new_bow">Neuer Bogen</string>
+    <string name="new_arrow">Neuer Pfeil</string>
+    <string name="new_round">Neue Runde</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d Training ausgewählt</item>
+        <item quantity="other">%d Trainings ausgewählt</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d Bogen ausgewählt</item>
+        <item quantity="other">%d Bögen ausgewählt</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d Pfeil ausgewählt</item>
+        <item quantity="other">%d Pfeile ausgewählt</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">Eine Passe ausgewählt</item>
+        <item quantity="other">%d Passen ausgewählt</item>
+    </plurals>
+    <string name="edit">Bearbeiten</string>
+    <string name="delete">Löschen</string>
+    <string name="statistic">Statistik</string>
+    <!-- Share -->
+    <string name="share">Teilen</string>
+    <string name="dispersion_pattern">Trefferbild</string>
+    <string name="sharing_failed">Teilen fehlgeschlagen!</string>
+    <!-- Export -->
+    <string name="send_exported">Sende exportierte Daten</string>
+    <string name="exporting_failed">Export fehlgeschlagen!</string>
+    <!-- New bow -->
+    <string name="add_bow">Bogen hinzufügen</string>
+    <string name="name">Name</string>
+    <string name="bow_type">Bogenart</string>
+    <string name="properties">Eigenschaften</string>
+    <string name="brand">Marke</string>
+    <string name="size">Größe</string>
+    <string name="description">Beschreibung</string>
+    <string name="height">Standhöhe</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Visiereinstellungen</string>
+    <string name="add">Hinzufügen</string>
+    <string name="take_picture">Neues Foto aufnehmen</string>
+    <string name="pick_from_gallery">Foto aus Galerie auswählen</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Pfeil hinzufügen</string>
+    <string name="length">Länge</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Gewicht</string>
+    <string name="vanes">Befiederung</string>
+    <string name="nock">Nocke</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Titel</string>
+    <string name="outdoor">Draußen</string>
+    <string name="indoor">Halle</string>
+    <string name="distance">Entfernung</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">1 Passe</item>
+        <item quantity="other">%d Passen</item>
+    </plurals>
+    <string name="with">mit</string>
+    <plurals name="arrow">
+        <item quantity="one">einem Pfeil</item>
+        <item quantity="other">%d Pfeilen</item>
+    </plurals>
+    <string name="target_face">Auflage</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Schießzettel</string>
+    <string name="arrows">Pfeile</string>
+    <string name="sum">Summe</string>
+    <string name="carry">Übertrag</string>
+    <string name="action_print">Drucken</string>
+    <string name="average">Schnitt</string>
+    <!-- Input mode -->
+    <string name="comment">Kommentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Wähle eine Datei</string>
+    <string name="dir_not_created">Ordner konnte nicht erstellt werden!</string>
+    <string name="import_failed">Import gescheitert!</string>
+    <string name="file_not_found">Datei nicht gefunden!</string>
+    <string name="failed_reading_file">Fehler beim Einlesen der Datei!</string>
+    <!-- Donate -->
+    <string name="donate_2">Spende mir einen Burger</string>
+    <string name="donate_5">Spende mir einen Döner</string>
+    <string name="donate_10">Spende mir eine große Pizza</string>
+    <string name="donate_20">Spende mir ein bisschen Benzin</string>
+    <string name="donation_thank">Vielen Dank für Ihre Unterstützung!</string>
+    <string name="donate_text" formatted="false">Die Beträge sind inkl. Mehrwertsteuer und 30% Gebühren für Google. Alternativ kannst du mir auch gerne auf das PayPal Konto dreier.florian@gmail.com spenden.</string>
+    <!-- Timer -->
+    <string name="timer">Schießuhr</string>
+    <string name="touch_to_start">Berühren zum starten</string>
+    <string name="preparation">Fertig machen</string>
+    <string name="shooting">Schießen</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Schießzeit</string>
+    <string name="timer_waiting_time">Vorbereitungszeit</string>
+    <string name="timer_warning_time">Gelbphase</string>
+    <string name="timer_sound">Ton</string>
+    <string name="timer_vibrate">Vibration</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Importieren</string>
+    <string name="exports_as_csv">Export als csv</string>
+    <string name="licences">Open Source-Lizenzen</string>
+    <string name="licences_summary">Rechtliche Hinweise zu Lizenzen</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d Sekunde</item>
+        <item quantity="other">%d Sekunden</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Daten</string>
+    <string name="weather">Wetter</string>
+    <string name="environment">Umgebung</string>
+    <string name="wind_speed">Windgeschwindigkeit</string>
+    <string name="wind_direction">Windrichtung</string>
+    <string name="sight_setting_removed">Visier Einstellung gelöscht!</string>
+    <string name="metric">Metrisch</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Rückgängig</string>
+    <string name="standard_rounds">Standardrunden</string>
+    <string name="expand_collapse">Ausklappen/Einklappen</string>
+    <string name="new_round_template">Neue Vorlage</string>
+    <string name="arrow_numbers">Pfeile nummerieren</string>
+    <string name="round_removed">Runde gelöscht!</string>
+    <string name="custom_round">Benutzerdefinierte Runde</string>
+    <string name="filter">Filtern</string>
+    <string name="club">Verein</string>
+    <string name="target">Zielscheibe</string>
+    <string name="standard_round">Standardrunde</string>
+    <string name="use_as_template">Als Vorlage verwenden?</string>
+    <string name="create_copy">Das ist eine Standardrunde!\nWillst du eine Kopie erzeugen um sie bearbeiten zu können?</string>
+    <string name="practice">Übung</string>
+    <string name="edit_training">Training bearbeiten</string>
+    <string name="edit_standard_round">Standardrunde bearbeiten</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">Ein Pfeil gelöscht</item>
+        <item quantity="other">%d Pfeile gelöscht</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">Ein Bogen gelöscht</item>
+        <item quantity="other">%d Bögen gelöscht</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">Ein Training gelöscht</item>
+        <item quantity="other">%d Trainings gelöscht</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">Eine Passe gelöscht</item>
+        <item quantity="other">%d Passen gelöscht</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Runde %d</item>
+        <item quantity="other">Runde %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d Runde ausgewählt</item>
+        <item quantity="other">%d Runden ausgewählt</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d Runde gelöscht</item>
+        <item quantity="other">%d Runden gelöscht</item>
+    </plurals>
+    <string name="date">Datum</string>
+    <string name="edit_round">Runde bearbeiten</string>
+    <string name="draw_weight">Zugkraft</string>
+    <string name="sight">Visier</string>
+    <string name="limbs">Wurfarme</string>
+    <string name="my_bow">Mein Bogen</string>
+    <string name="my_arrow">Mein Pfeil</string>
+    <string name="tip_weight">Spitzengewicht</string>
+    <string name="arrow_ranking">Pfeil-Rangliste</string>
+    <string name="arrow_x_of_set_of_arrows">Pfeil %1$s von %2$s</string>
+    <string name="display">Anzeige</string>
+    <string name="print">Drucken</string>
+    <string name="table">Tabelle</string>
+    <string name="comments">Kommentare</string>
+    <string name="show_points_colored">Ringe farbig anzeigen</string>
+    <string name="stabilizer">Stabilisator</string>
+    <string name="clicker">Klicker</string>
+    <string name="arrow_number_x">Pfeil Nr. %s</string>
+    <string name="training_with_standard_round">Training mit Standard Runde</string>
+    <string name="free_training">Freies Training</string>
+    <string name="competition">Wettkampf</string>
+    <string name="about">Über</string>
+    <string name="general">Allgemein</string>
+    <string name="contribute">Beitragen</string>
+    <string name="connect">Verbinden</string>
+    <string name="special_thanks_to">Besonderen Dank an</string>
+    <string name="all_translators">Alle Leute, die dabei geholfen haben, die App zu übersetzen!</string>
+    <string name="all_beta_testers">Alle, die als Mitglieder der Beta Tester Gruppe dazu beitragen die App kontinuierlich zu verbessern.</string>
+    <string name="test_beta">Die neueste Betaversion testen</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Mit Ihren Freunden teilen</string>
+    <string name="donate">Spenden</string>
+    <string name="donate_via_paypal">Spenden via PayPal</string>
+    <string name="translate_crowdin">Auf Crowdin übersetzen</string>
+    <string name="network_linkedin">Auf LinkedIn vernetzen</string>
+    <string name="search">Suche</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Ganzes Training</string>
+    <string name="show_shots_round">Aktuelle Runde</string>
+    <string name="show_shots_end">Aktuelle Passe</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Geburtsdatum</string>
+    <string name="first_name">Vorname</string>
+    <string name="last_name">Nachname</string>
+    <string name="age">Alter</string>
+    <string name="show_signature">Unterschrift</string>
+    <string name="archer">Bogenschütze</string>
+    <string name="hits">Treffer</string>
+    <string name="misses">Nicht-Treffer</string>
+    <string name="new_end">Neue Passe</string>
+    <string name="distribution">Verteilung</string>
+    <string name="count">Anzahl</string>
+    <string name="diameter">Durchmesser</string>
+    <string name="input">Eingabe</string>
+    <string name="target_zoom">Zoomstufe für Zielscheibe</string>
+    <string name="action_pdf">Als PDF exportieren</string>
+    <string name="arrow_diameter_scale">Pfeildurchmesser Skalierung</string>
+    <string name="timestamp">Uhrzeit</string>
+    <string name="change_target_face">Auflage ändern</string>
+    <string name="your_first_training">Dein erstes Training</string>
+    <string name="grouping">Gruppierung</string>
+    <string name="show_clusters">Gruppen</string>
+    <string name="first_training_description">Tippe auf das Plus um ein neues Training zu starten.</string>
+    <string name="show_average">Durchschnitt</string>
+    <string name="show_none">Nichts</string>
+    <string name="left_handed">Linkshänder</string>
+    <string name="right_handed">Rechtshänder</string>
+    <string name="keyboard">Tastatur</string>
+    <string name="backup_drive_desc">Das Sichern Ihrer Daten ermöglicht es Ihnen, Ihre Trainingsdaten wiederherzustellen, wenn Sie Ihr Gerät verlieren oder durch ein anderes ersetzen.</string>
+    <string name="backup_now">Jetzt sichern</string>
+    <string name="last_backup">Letztes Backup: %s</string>
+    <string name="recent_backups">Letzte Sicherungen</string>
+    <string name="dialog_restore_title">Diese Version wiederherstellen</string>
+    <string name="restore_desc">Durch das Wiederherstellen der Sicherung werden alle vorhandenen Daten überschrieben.</string>
+    <string name="backup_details">Backup-Details</string>
+    <string name="restore">Wiederherstellen</string>
+    <string name="backup_location">Speicherort für Sicherung</string>
+    <string name="internal_storage">Interner Speicher</string>
+    <string name="automatic_backup">Automatische Sicherung</string>
+    <string name="restoring">Sicherung wiederherstellen…</string>
+    <string name="restore_failed">Wiederherstellen fehlgeschlagen</string>
+    <string name="delete_failed">Löschen fehlgeschlagen</string>
+    <string name="backup_restore_desc">Sicherungen erstellen und wiederherstellen</string>
+    <string name="exporting">Exportieren…</string>
+    <string name="loading_backups_failed">Abrufen der Sicherungen fehlgeschlagen!</string>
+    <string name="external_storage">Externe Speicherkarte</string>
+    <string name="backup_interval">Sicherungsintervall</string>
+    <string name="daily">Täglich</string>
+    <string name="weekly">Wöchentlich</string>
+    <string name="monthly">Monatlich</string>
+    <string name="connection_failed">Verbindung fehlgeschlagen!</string>
+    <string name="shooting_indoor">Schießen in der Halle</string>
+    <string name="bow_rest_vertical_position">Vertikale Ausrichtung</string>
+    <string name="bow_rest">Pfeilablage</string>
+    <string name="bow_rest_horizontal_position">Horizontale Ausrichtung</string>
+    <string name="bow_cam_settings">Cam Einstellungen</string>
+    <string name="bow_letoff_weight">Zugkraft beim Loslassen</string>
+    <string name="bow_nocking_point">Nockpunkt</string>
+    <string name="bow_string">Sehne</string>
+    <string name="bow_scope_magnification">Scope Vergrößerung</string>
+    <string name="bow_rest_stiffness">Steifigkeit</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">Weitere Felder</string>
+    <string name="recently_used">Zuletzt verwendet</string>
+    <string name="intro_title_track_training_progress">Vergiss Schießzettel aus Papier!</string>
+    <string name="intro_description_track_training_progress">Durch exakte Pfeilaufnahme\nkannst du nützlichere Erkenntnisse\naus deinen Trainingsdaten gewinnen.</string>
+    <string name="intro_title_everything_in_one_place">Alles was du brauchst\nan einem Ort</string>
+    <string name="intro_description_everything_in_one_place">Einschließlich Bogen-, Pfeil-\nund Visier-Verwaltung, \nSchießuhr, Statistiken \nund vieles mehr…</string>
+    <string name="average_arrow_score_per_end">Ringdurchschnitt pro Passe</string>
+    <string name="show_end">Passe anzeigen</string>
+    <string name="show_round">Runde anzeigen</string>
+    <string name="show_training">Training anzeigen</string>
+    <string name="summary">Zusammenfassung</string>
+    <string name="end">Passe</string>
+    <string name="average_of">Durchschnitt von</string>
+    <string name="displayed_shots">Sichtbare Schüsse</string>
+    <string name="invalid_decimal_number">Ungültige Dezimalzahl</string>
+    <string name="not_within_expected_range_mm">Nicht innerhalb des erwarteten Bereichs von 1 bis 20 mm</string>
+    <string name="not_within_expected_range_inch">Nicht innerhalb des erwarteten Bereichs von 0 bis 1 Zoll</string>
+    <string name="next_round">Nächste Runde</string>
+    <string name="previous_round">Vorherige Runde</string>
+    <string name="overview">Übersicht</string>
+    <string name="score">Punktzahl</string>
+    <string name="show_reached_score">Erreichte Ringzahl anzeigen</string>
+    <string name="show_total_score">Maximal erreichbare Ringzahl anzeigen</string>
+    <string name="show_percentage">Prozent anzeigen</string>
+    <string name="show_arrow_average">Pfeildurchschnitt anzeigen</string>
+    <string name="image_deleted">Bild gelöscht</string>
+    <string name="delete_image">Bild löschen?</string>
+    <string name="keyboard_type">Tastaturtyp</string>
+    <string name="keyboard_enabled">Tastatur aktiviert</string>
+    <string name="sort_shots">Schüsse sortieren</string>
+    <string name="sort_shots_for_spots">Schüsse bei Spot Auflagen sortieren</string>
+    <string name="target_captain">Schreiber</string>
+    <string name="language">Sprache</string>
+    <string name="warning_backup_experimental">Achtung: Dieses Feature ist noch experimentell! Bitte überprüfen Sie in regelmäßigen Abständen, ob die Sicherung erfolgreich war!</string>
+    <string name="drawer_open">Navigationsleiste öffnen</string>
+    <string name="drawer_close">Navigationsleiste schließen</string>
+    <string name="help">Hilfe</string>
+    <string name="home">Startseite</string>
+    <string name="click_to_enter_profile">Tippen um das Profil anzupassen</string>
+    <string name="no_trainings">Du hast noch keine Trainings!</string>
+    <string name="no_bows">Keine Bögen</string>
+    <string name="no_arrows">Keine Pfeile</string>
+    <string name="version_info">Versionsinfo</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Höchste Pfeil-Nummer</string>
+    <string name="distances">Entfernungen</string>
+    <string name="diameters">Durchmesser</string>
+    <string name="bows">Bögen</string>
+    <string name="reset">Zurücksetzen</string>
+    <string name="end_x_of_y">Passe %1$d/%2$d</string>
+    <string name="round_x_of_y">Runde %1$d/%2$d</string>
+    <string name="settings_summary_timer">Verhalten der Schießuhr anpassen</string>
+    <string name="settings_summary_scoreboard">Aussehen des Schießzettels ändern</string>
+    <string name="settings_summary_input">Personalisierung des Eingabe-Bildschirms</string>
+    <string name="settings_summary_overview">Anpassen der angezeigten Infos für Trainings, Runden und Passen</string>
+    <string name="settings_summary_profile">Persönliche Informationen bearbeiten</string>
+    <string name="licence_number">Lizenz-Nummer</string>
+    <string name="file_type">Dateityp</string>
+    <string name="clear">Löschen</string>
+    <string name="tap_to_sign">Tippen zum Unterschreiben</string>
+    <string name="pdf_file">PDF-Datei</string>
+    <string name="image_file">Bild-Datei</string>
+    <string name="settings_summary_statistics">Statistik anpassen</string>
+    <string name="settings_statistics_spots_to_single_target">Fasse Spots zu einer einzigen Zielscheibe zusammen</string>
+    <string name="keep_above_lockscreen">Auf dem Sperrbildschirm anzeigen</string>
+    <string name="scoreboard_title_all_rounds">Alle Runden</string>
+    <string name="permission_required">Berechtigung erforderlich</string>
+    <string name="backup_permission_explanation"><![CDATA[Um ein Backup Ihrer Daten machen zu können, benötigt die App Zugriff auf den internen Speicher des Telefons. Um die Backup Funktion verwenden zu können gehe zu Systemeinstellungen > Apps > MyTargets > Berechtigungen und aktiviere den Eintrag \'Speicher\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 83e5f84f0..f8bd9ed1e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d end</item>
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="one">%d arrow</item>
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Options</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Previous</string>
+    <string name="next">Next</string>
+    <string name="save">Save</string>
+    <string name="custom">Custom</string>
+    <string name="training">Training</string>
+    <string name="bow">Bow</string>
+    <string name="arrow">Arrow</string>
+    <string name="round">Round</string>
+    <string name="points">Points</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d arrow selected</item>
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Share</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Exporting failed!</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Name</string>
+    <string name="bow_type">Bow type</string>
+    <string name="properties">Properties</string>
+    <string name="brand">Brand</string>
+    <string name="size">Size</string>
+    <string name="description">Description</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sight settings</string>
+    <string name="add">Add</string>
+    <string name="take_picture">Take a picture</string>
+    <string name="pick_from_gallery">Select a picture from gallery</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Add arrow</string>
+    <string name="length">Length</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Weight</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d end</item>
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="one">%d arrow</item>
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Arrows</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Print</string>
+    <string name="average">Average</string>
+    <!-- Input mode -->
+    <string name="comment">Comment</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Select a file</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index dd273e5bc..b6509d735 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -15,356 +15,357 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opciones</string>
-  <string name="settings">Ajustes</string>
-  <string name="prev">Previo</string>
-  <string name="next">Siguiente</string>
-  <string name="save">Guardar</string>
-  <string name="custom">A medida</string>
-  <string name="training">Entrenamiento</string>
-  <string name="bow">Arco</string>
-  <string name="arrow">Flecha</string>
-  <string name="round">Serie</string>
-  <string name="points">Puntos</string>
-  <string name="passe">Tanda</string>
-  <!-- Overview -->
-  <string name="new_training">Nuevo Entrenamiento</string>
-  <string name="new_bow">Nuevo Arco</string>
-  <string name="new_arrow">Nueva Flecha</string>
-  <string name="new_round">Nueva Serie</string>
-  <plurals name="training_selected">
-    <item quantity="one">Un Entrenamiento Seleccionado</item>
-    <item quantity="other">%d Entrenamientos Seleccionados</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Un Arco Seleccionado</item>
-    <item quantity="other">%d Arcos Seleccionados</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Una Flecha Seleccionada</item>
-    <item quantity="other">%d Flechas Seleccionadas</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Una Tanda Seleccionada</item>
-    <item quantity="other">%d Tandas Seleccionadas</item>
-  </plurals>
-  <string name="edit">Editar</string>
-  <string name="delete">Borrar</string>
-  <string name="statistic">Estadisticas</string>
-  <!-- Share -->
-  <string name="share">Compartir</string>
-  <string name="dispersion_pattern">Patrón de Dispersión</string>
-  <string name="sharing_failed">¡Fallo al Compartir!</string>
-  <!-- Export -->
-  <string name="send_exported">Enviando Datos Exportados</string>
-  <string name="exporting_failed">¡La Exportación ha fallado!</string>
-  <!-- New bow -->
-  <string name="add_bow">Añadir un Arco</string>
-  <string name="name">Nombre</string>
-  <string name="bow_type">Tipo de Arco</string>
-  <string name="properties">Propiedades</string>
-  <string name="brand">Marca</string>
-  <string name="size">Talla</string>
-  <string name="description">Descripción</string>
-  <string name="height">Fistmelle</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Configuraciones de la Mira</string>
-  <string name="add">Añadir</string>
-  <string name="take_picture">Tomar una foto</string>
-  <string name="pick_from_gallery">Escoge una foto de la Galería</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Añadir una Flecha</string>
-  <string name="length">Longitud</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Peso</string>
-  <string name="vanes">Plumas</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Titulo</string>
-  <string name="outdoor">Al aire libre</string>
-  <string name="indoor">Interior</string>
-  <string name="distance">Distancia</string>
-  <string name="format">Formato</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">1 Tanda</item>
-    <item quantity="other">%d Tandas</item>
-  </plurals>
-  <string name="with">de</string>
-  <plurals name="arrow">
-    <item quantity="one">una Flecha</item>
-    <item quantity="other">%d Flechas</item>
-  </plurals>
-  <string name="target_face">Tamaño de Objetivo</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Tablilla de Puntos</string>
-  <string name="arrows">Flechas</string>
-  <string name="sum">Puntuación</string>
-  <string name="carry">Agregada</string>
-  <string name="action_print">Imprimir</string>
-  <string name="average">Promedio</string>
-  <!-- Input mode -->
-  <string name="comment">Comentario</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Seleccione un archivo</string>
-  <string name="dir_not_created">¡No se ha podido crear el directorio!</string>
-  <string name="import_failed">¡Fallo en la Importación!</string>
-  <string name="file_not_found">¡Archivo no encontrado!</string>
-  <string name="failed_reading_file">¡Fallo leyendo el archivo!</string>
-  <!-- Donate -->
-  <string name="donate_2">Dóname para una hamburguesa</string>
-  <string name="donate_5">Dóname para un kebab</string>
-  <string name="donate_10">Dóname para una pizza familiar</string>
-  <string name="donate_20">Dóname para gasolina</string>
-  <string name="donation_thank">¡Gracias por tu ayuda!</string>
-  <string name="donate_text" formatted="false">Los impuestos están incluidos. IVA y el 30% de tasas para Google. Como alternativa, puedes gustosamente donar en mi cuenta de PayPal (dreier.florian@gmail.com).</string>
-  <!-- Timer -->
-  <string name="timer">Cronómetro</string>
-  <string name="touch_to_start">Pulsa para empezar</string>
-  <string name="preparation">Preparación..</string>
-  <string name="shooting">Disparando..</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Tiempo de Disparo</string>
-  <string name="timer_waiting_time">Tiempo de Preparación</string>
-  <string name="timer_warning_time">Tiempo de Precaución</string>
-  <string name="timer_sound">Sonido</string>
-  <string name="timer_vibrate">Vibración</string>
-  <!-- Settings -->
-  <string name="backup_action">Hacer copia de seguridad</string>
-  <string name="import_action">Importar</string>
-  <string name="exports_as_csv">Exportar como archivo Csv</string>
-  <string name="licences">Licencias Open Source</string>
-  <string name="licences_summary">Notas legales de la licencia</string>
-  <string name="version">Versión %s</string>
-  <plurals name="second">
-    <item quantity="one">%d Segundo</item>
-    <item quantity="other">%d Segundos</item>
-  </plurals>
-  <string name="info">Información</string>
-  <string name="data">Datos</string>
-  <string name="weather">El Tiempo</string>
-  <string name="environment">Entorno</string>
-  <string name="wind_speed">Velocidad del viento</string>
-  <string name="wind_direction">Dirección del viento</string>
-  <string name="sight_setting_removed">¡Configuración de visor eliminada!</string>
-  <string name="metric">Métrico</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Deshacer</string>
-  <string name="standard_rounds">Serie Estándar</string>
-  <string name="expand_collapse">Expandir o contraer</string>
-  <string name="new_round_template">Nueva plantilla</string>
-  <string name="arrow_numbers">Números de flecha</string>
-  <string name="round_removed">¡Serie eliminada!</string>
-  <string name="custom_round">Serie personalizada</string>
-  <string name="filter">Filtro</string>
-  <string name="club">Club</string>
-  <string name="target">Blanco</string>
-  <string name="standard_round">Serie estándar</string>
-  <string name="use_as_template">¿Utilizar como plantilla?</string>
-  <string name="create_copy">¡Esta es una Serie estándar! \n ¿Deseas crear una copia para poder editarla?</string>
-  <string name="practice">Practicar</string>
-  <string name="edit_training">Editar Entrenamiento</string>
-  <string name="edit_standard_round">Editar Serie estándar</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">Una flecha eliminada</item>
-    <item quantity="other">%d Flechas eliminadas</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">Un Arco eliminado</item>
-    <item quantity="other">%d Arcos eliminados</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">Un Entrenamiento eliminado</item>
-    <item quantity="other">%d Entrenamientos eliminados</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">Una Tanda Eliminada</item>
-    <item quantity="other">%d Tandas eliminadas</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">%d Serie</item>
-    <item quantity="other">%d Series</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">Una Serie seleccionada</item>
-    <item quantity="other">%d Series Seleccionadas</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">Una Serie elminada</item>
-    <item quantity="other">%d Series Eliminadas</item>
-  </plurals>
-  <string name="date">Fecha</string>
-  <string name="edit_round">Editar Serie</string>
-  <string name="draw_weight">Potencia</string>
-  <string name="sight">Visor</string>
-  <string name="limbs">Palas</string>
-  <string name="my_bow">Mi Arco</string>
-  <string name="my_arrow">Mi Flecha</string>
-  <string name="tip_weight">Peso de punta</string>
-  <string name="arrow_ranking">Puntuación de Flechas</string>
-  <string name="arrow_x_of_set_of_arrows">Flecha %1$s de %2$s</string>
-  <string name="display">Pantalla</string>
-  <string name="print">Imprimir</string>
-  <string name="table">Tabla</string>
-  <string name="comments">Comentarios</string>
-  <string name="show_points_colored">Ver puntos de coloreados</string>
-  <string name="stabilizer">Estabilizador</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Flecha número %s</string>
-  <string name="training_with_standard_round">Entrenamiento Serie Estándar</string>
-  <string name="free_training">Entrenamiento Libre</string>
-  <string name="competition">Competición</string>
-  <string name="about">Acerca (Nº versión)</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribuir</string>
-  <string name="connect">Conectar</string>
-  <string name="special_thanks_to">Agradecimientos especiales a</string>
-  <string name="all_translators">Todos los chicos, que ayudó a traducir la aplicación!</string>
-  <string name="all_beta_testers">A todos aquellos que se unieron al programa de beta-testers y por lo tanto ayudaron a la mejora continua de la aplicación.</string>
-  <string name="test_beta">Prueba la ultima versión Beta</string>
-  <string name="join_on_google_plus">Únete a nosotros en Google+</string>
-  <string name="share_with_friends">Comparte con tus amigos</string>
-  <string name="donate">Dona</string>
-  <string name="donate_via_paypal">Donar vía PayPal</string>
-  <string name="translate_crowdin">Traducir en Crowdin</string>
-  <string name="network_linkedin">Red de LinkedIn</string>
-  <string name="search">Buscar</string>
-  <string name="us">Estados Unidos</string>
-  <string name="show_shots_training">Totalidad del Entrenamiento</string>
-  <string name="show_shots_round">Serie actual</string>
-  <string name="show_shots_end">Tanda actual</string>
-  <string name="profile">Perfil</string>
-  <string name="birthday">Fecha de nacimiento</string>
-  <string name="first_name">Nombre</string>
-  <string name="last_name">Apellido(s)</string>
-  <string name="age">Edad</string>
-  <string name="show_signature">Firma</string>
-  <string name="archer">Arquero</string>
-  <string name="hits">Aciertos</string>
-  <string name="misses">Fallos</string>
-  <string name="new_end">Nueva Tanda</string>
-  <string name="distribution">Distribución</string>
-  <string name="count">Cuenta</string>
-  <string name="diameter">Diámetro</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Nivel de zoom</string>
-  <string name="action_pdf">Exportar como PDF</string>
-  <string name="arrow_diameter_scale">Medida de diámetro de Flecha</string>
-  <string name="timestamp">Fecha/Hora</string>
-  <string name="change_target_face">Cambiar el modelo de diana</string>
-  <string name="your_first_training">Su primer entrenamiento</string>
-  <string name="grouping">Agrupamiento</string>
-  <string name="show_clusters">Agrupamiento</string>
-  <string name="first_training_description">Pulse + para iniciar un nuevo entrenamiento.</string>
-  <string name="show_average">Promedio</string>
-  <string name="show_none">Ninguno</string>
-  <string name="left_handed">Zurdo</string>
-  <string name="right_handed">Diestro</string>
-  <string name="keyboard">Teclado</string>
-  <string name="backup_drive_desc">La copia de seguridad de sus datos le permite restaurar todos los entrenamientos en caso de perdida o cambiar tu teléfono.</string>
-  <string name="backup_now">Realizar copia de seguridad</string>
-  <string name="last_backup">Última copia de seguridad: %s</string>
-  <string name="recent_backups">Copias de seguridad recientes</string>
-  <string name="dialog_restore_title">Volver a la versión anterior</string>
-  <string name="restore_desc">Restaurar los datos sobrescribirá todos los datos existentes con la copia de seguridad.</string>
-  <string name="backup_details">Detalles de la Copia de Seguridad</string>
-  <string name="restore">Restaurar</string>
-  <string name="backup_location">Ubicación de la Copia de Seguridad</string>
-  <string name="internal_storage">Almacenamiento interno</string>
-  <string name="automatic_backup">Copia de seguridad automática</string>
-  <string name="restoring">Restaurando Copia de Seguridad…</string>
-  <string name="restore_failed">Restauración fallida</string>
-  <string name="delete_failed">Error al borrar</string>
-  <string name="backup_restore_desc">Copiar y restaurar los datos de la aplicación</string>
-  <string name="exporting">Exportando…</string>
-  <string name="loading_backups_failed">¡Error al cargar Copias de Seguridad!</string>
-  <string name="external_storage">Almacenamiento externo</string>
-  <string name="backup_interval">Intervalo de copia de seguridad</string>
-  <string name="daily">Diariamente</string>
-  <string name="weekly">Semanalmente</string>
-  <string name="monthly">Mensualmente</string>
-  <string name="connection_failed">¡Error de conexión!</string>
-  <string name="shooting_indoor">Tiro en sala</string>
-  <string name="bow_rest_vertical_position">Posición vertical</string>
-  <string name="bow_rest">Descansar</string>
-  <string name="bow_rest_horizontal_position">Posición horizontal</string>
-  <string name="bow_cam_settings">Configuración de la Cámara</string>
-  <string name="bow_letoff_weight">Letoff</string>
-  <string name="bow_nocking_point">Punto de Encoque</string>
-  <string name="bow_string">Texto</string>
-  <string name="bow_scope_magnification">Aumentos de visor</string>
-  <string name="bow_rest_stiffness">Rigidez</string>
-  <string name="bow_button">Botón</string>
-  <string name="more_fields">Más campos</string>
-  <string name="recently_used">Usados recientemente</string>
-  <string name="intro_title_track_training_progress">¡Olvídate de las hojas de puntos de papel!</string>
-  <string name="intro_description_track_training_progress">Con un dibujo exacto del lugar de impacto de la flecha, \n puedes conseguir un conocimiento más profundo \n a partir de los datos de entrenamiento.</string>
-  <string name="intro_title_everything_in_one_place">Todo lo que necesitas \n en un lugar</string>
-  <string name="intro_description_everything_in_one_place">Incluyendo arco - flecha-\nand sightmark-gestión, \narchery timer, estadísticas \nand mucho más…</string>
-  <string name="average_arrow_score_per_end">Promedio de puntuaciones por Tanda</string>
-  <string name="show_end">Ver Tanda</string>
-  <string name="show_round">Ver Serie</string>
-  <string name="show_training">Ver Entrenamiento</string>
-  <string name="summary">Resumen</string>
-  <string name="end">Tanda</string>
-  <string name="average_of">Promedio de</string>
-  <string name="displayed_shots">Tiros mostrados</string>
-  <string name="invalid_decimal_number">Numero decimal incorrecto</string>
-  <string name="not_within_expected_range_mm">No dentro del rango esperado de 1 a 20 mm</string>
-  <string name="not_within_expected_range_inch">No dentro del rango esperado de 0 a 1 pulgada</string>
-  <string name="next_round">Próxima Ronda</string>
-  <string name="previous_round">Ronda anterior</string>
-  <string name="overview">Vista global</string>
-  <string name="score">Marcador</string>
-  <string name="show_reached_score">Mostrar puntuación alcanzada</string>
-  <string name="show_total_score">Mostrar puntuación total</string>
-  <string name="show_percentage">Mostrar porcentajes</string>
-  <string name="show_arrow_average">Mostrar promedio de Flechas</string>
-  <string name="image_deleted">Imagen borrada</string>
-  <string name="delete_image">¿Borrar imagen?</string>
-  <string name="keyboard_type">Tipo de teclado</string>
-  <string name="keyboard_enabled">Teclado habilitado</string>
-  <string name="sort_shots">Tiros Rapidos</string>
-  <string name="sort_shots_for_spots">Tiros rapidos a diferentes target faces</string>
-  <string name="target_captain">Capitan de Diana</string>
-  <string name="language">idioma</string>
-  <string name="warning_backup_experimental">Precaución: esta caracteristica es todavia experimental. por favor, revisa regularmente que tu backup se ha realizado exitosamente!</string>
-  <string name="drawer_open">Abrir menu</string>
-  <string name="drawer_close">Cerrar menú</string>
-  <string name="help">Ayuda</string>
-  <string name="home">Inicio</string>
-  <string name="click_to_enter_profile">Haz Click para la informacion del perfil</string>
-  <string name="no_trainings">No tienes ningun entrenamiento todavía!</string>
-  <string name="no_bows">Sin Arcos</string>
-  <string name="no_arrows">Sin Flechas</string>
-  <string name="version_info">Información de la versión</string>
-  <string name="version_prefix">Versión</string>
-  <string name="max_arrow_number">Numero máximo de Flecha</string>
-  <string name="distances">Distancias</string>
-  <string name="diameters">Diametros</string>
-  <string name="bows">Arcos</string>
-  <string name="reset">Resetear</string>
-  <string name="end_x_of_y">Tanda %1$d/%2$d</string>
-  <string name="round_x_of_y">Serie %1$d/%2$d</string>
-  <string name="settings_summary_timer">Ajustar el comportamiento del reloj de tiro</string>
-  <string name="settings_summary_scoreboard">Cambiar la apariencia del marcador</string>
-  <string name="settings_summary_input">Customizar la pantalla de entrada</string>
-  <string name="settings_summary_overview">Personalizar la información mostrada para entrenamientos, entradas y rondas</string>
-  <string name="settings_summary_profile">Introducir información personal</string>
-  <string name="licence_number">Nº de Licencia</string>
-  <string name="file_type">Tipo de Archivo</string>
-  <string name="clear">Limpiar</string>
-  <string name="tap_to_sign">Pulsa para iniciar sesión</string>
-  <string name="pdf_file">Archivo PDF</string>
-  <string name="image_file">Archivo de imagen</string>
-  <string name="settings_summary_statistics">Ajustar la pantalla de estadísticas</string>
-  <string name="settings_statistics_spots_to_single_target">Agregar puntos en una sola diana</string>
-  <string name="keep_above_lockscreen">Mantener sobre la pantalla de bloqueo</string>
-  <string name="scoreboard_title_all_rounds">Todas las entradas</string>
-  <string name="permission_required">Se necesita permiso</string>
-  <string name="backup_permission_explanation"><![CDATA[Para poder hacer un backup de tus datos, la aplicación necesita permiso de aaceso al almacenamiento interno de tu movil. Para usar la opción de backup vete a: 
+    <!-- General -->
+    <string name="preferences">Opciones</string>
+    <string name="settings">Ajustes</string>
+    <string name="prev">Previo</string>
+    <string name="next">Siguiente</string>
+    <string name="save">Guardar</string>
+    <string name="custom">A medida</string>
+    <string name="training">Entrenamiento</string>
+    <string name="bow">Arco</string>
+    <string name="arrow">Flecha</string>
+    <string name="round">Serie</string>
+    <string name="points">Puntos</string>
+    <string name="passe">Tanda</string>
+    <!-- Overview -->
+    <string name="new_training">Nuevo Entrenamiento</string>
+    <string name="new_bow">Nuevo Arco</string>
+    <string name="new_arrow">Nueva Flecha</string>
+    <string name="new_round">Nueva Serie</string>
+    <plurals name="training_selected">
+        <item quantity="one">Un Entrenamiento Seleccionado</item>
+        <item quantity="other">%d Entrenamientos Seleccionados</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">Un Arco Seleccionado</item>
+        <item quantity="other">%d Arcos Seleccionados</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">Una Flecha Seleccionada</item>
+        <item quantity="other">%d Flechas Seleccionadas</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">Una Tanda Seleccionada</item>
+        <item quantity="other">%d Tandas Seleccionadas</item>
+    </plurals>
+    <string name="edit">Editar</string>
+    <string name="delete">Borrar</string>
+    <string name="statistic">Estadisticas</string>
+    <!-- Share -->
+    <string name="share">Compartir</string>
+    <string name="dispersion_pattern">Patrón de Dispersión</string>
+    <string name="sharing_failed">¡Fallo al Compartir!</string>
+    <!-- Export -->
+    <string name="send_exported">Enviando Datos Exportados</string>
+    <string name="exporting_failed">¡La Exportación ha fallado!</string>
+    <!-- New bow -->
+    <string name="add_bow">Añadir un Arco</string>
+    <string name="name">Nombre</string>
+    <string name="bow_type">Tipo de Arco</string>
+    <string name="properties">Propiedades</string>
+    <string name="brand">Marca</string>
+    <string name="size">Talla</string>
+    <string name="description">Descripción</string>
+    <string name="height">Fistmelle</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Configuraciones de la Mira</string>
+    <string name="add">Añadir</string>
+    <string name="take_picture">Tomar una foto</string>
+    <string name="pick_from_gallery">Escoge una foto de la Galería</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Añadir una Flecha</string>
+    <string name="length">Longitud</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Peso</string>
+    <string name="vanes">Plumas</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Titulo</string>
+    <string name="outdoor">Al aire libre</string>
+    <string name="indoor">Interior</string>
+    <string name="distance">Distancia</string>
+    <string name="format">Formato</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">1 Tanda</item>
+        <item quantity="other">%d Tandas</item>
+    </plurals>
+    <string name="with">de</string>
+    <plurals name="arrow">
+        <item quantity="one">una Flecha</item>
+        <item quantity="other">%d Flechas</item>
+    </plurals>
+    <string name="target_face">Tamaño de Objetivo</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Tablilla de Puntos</string>
+    <string name="arrows">Flechas</string>
+    <string name="sum">Puntuación</string>
+    <string name="carry">Agregada</string>
+    <string name="action_print">Imprimir</string>
+    <string name="average">Promedio</string>
+    <!-- Input mode -->
+    <string name="comment">Comentario</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Seleccione un archivo</string>
+    <string name="dir_not_created">¡No se ha podido crear el directorio!</string>
+    <string name="import_failed">¡Fallo en la Importación!</string>
+    <string name="file_not_found">¡Archivo no encontrado!</string>
+    <string name="failed_reading_file">¡Fallo leyendo el archivo!</string>
+    <!-- Donate -->
+    <string name="donate_2">Dóname para una hamburguesa</string>
+    <string name="donate_5">Dóname para un kebab</string>
+    <string name="donate_10">Dóname para una pizza familiar</string>
+    <string name="donate_20">Dóname para gasolina</string>
+    <string name="donation_thank">¡Gracias por tu ayuda!</string>
+    <string name="donate_text" formatted="false">Los impuestos están incluidos. IVA y el 30% de tasas para Google. Como alternativa, puedes gustosamente donar en mi cuenta de PayPal (dreier.florian@gmail.com).</string>
+    <!-- Timer -->
+    <string name="timer">Cronómetro</string>
+    <string name="touch_to_start">Pulsa para empezar</string>
+    <string name="preparation">Preparación..</string>
+    <string name="shooting">Disparando..</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Tiempo de Disparo</string>
+    <string name="timer_waiting_time">Tiempo de Preparación</string>
+    <string name="timer_warning_time">Tiempo de Precaución</string>
+    <string name="timer_sound">Sonido</string>
+    <string name="timer_vibrate">Vibración</string>
+    <!-- Settings -->
+    <string name="backup_action">Hacer copia de seguridad</string>
+    <string name="import_action">Importar</string>
+    <string name="exports_as_csv">Exportar como archivo Csv</string>
+    <string name="licences">Licencias Open Source</string>
+    <string name="licences_summary">Notas legales de la licencia</string>
+    <string name="version">Versión %s</string>
+    <plurals name="second">
+        <item quantity="one">%d Segundo</item>
+        <item quantity="other">%d Segundos</item>
+    </plurals>
+    <string name="info">Información</string>
+    <string name="data">Datos</string>
+    <string name="weather">El Tiempo</string>
+    <string name="environment">Entorno</string>
+    <string name="wind_speed">Velocidad del viento</string>
+    <string name="wind_direction">Dirección del viento</string>
+    <string name="sight_setting_removed">¡Configuración de visor eliminada!</string>
+    <string name="metric">Métrico</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Deshacer</string>
+    <string name="standard_rounds">Serie Estándar</string>
+    <string name="expand_collapse">Expandir o contraer</string>
+    <string name="new_round_template">Nueva plantilla</string>
+    <string name="arrow_numbers">Números de flecha</string>
+    <string name="round_removed">¡Serie eliminada!</string>
+    <string name="custom_round">Serie personalizada</string>
+    <string name="filter">Filtro</string>
+    <string name="club">Club</string>
+    <string name="target">Blanco</string>
+    <string name="standard_round">Serie estándar</string>
+    <string name="use_as_template">¿Utilizar como plantilla?</string>
+    <string name="create_copy">¡Esta es una Serie estándar! \n ¿Deseas crear una copia para poder editarla?</string>
+    <string name="practice">Practicar</string>
+    <string name="edit_training">Editar Entrenamiento</string>
+    <string name="edit_standard_round">Editar Serie estándar</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">Una flecha eliminada</item>
+        <item quantity="other">%d Flechas eliminadas</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">Un Arco eliminado</item>
+        <item quantity="other">%d Arcos eliminados</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">Un Entrenamiento eliminado</item>
+        <item quantity="other">%d Entrenamientos eliminados</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">Una Tanda Eliminada</item>
+        <item quantity="other">%d Tandas eliminadas</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">%d Serie</item>
+        <item quantity="other">%d Series</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">Una Serie seleccionada</item>
+        <item quantity="other">%d Series Seleccionadas</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">Una Serie elminada</item>
+        <item quantity="other">%d Series Eliminadas</item>
+    </plurals>
+    <string name="date">Fecha</string>
+    <string name="edit_round">Editar Serie</string>
+    <string name="draw_weight">Potencia</string>
+    <string name="sight">Visor</string>
+    <string name="limbs">Palas</string>
+    <string name="my_bow">Mi Arco</string>
+    <string name="my_arrow">Mi Flecha</string>
+    <string name="tip_weight">Peso de punta</string>
+    <string name="arrow_ranking">Puntuación de Flechas</string>
+    <string name="arrow_x_of_set_of_arrows">Flecha %1$s de %2$s</string>
+    <string name="display">Pantalla</string>
+    <string name="print">Imprimir</string>
+    <string name="table">Tabla</string>
+    <string name="comments">Comentarios</string>
+    <string name="show_points_colored">Ver puntos de coloreados</string>
+    <string name="stabilizer">Estabilizador</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Flecha número %s</string>
+    <string name="training_with_standard_round">Entrenamiento Serie Estándar</string>
+    <string name="free_training">Entrenamiento Libre</string>
+    <string name="competition">Competición</string>
+    <string name="about">Acerca (Nº versión)</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribuir</string>
+    <string name="connect">Conectar</string>
+    <string name="special_thanks_to">Agradecimientos especiales a</string>
+    <string name="all_translators">Todos los chicos, que ayudó a traducir la aplicación!</string>
+    <string name="all_beta_testers">A todos aquellos que se unieron al programa de beta-testers y por lo tanto ayudaron a la mejora continua de la aplicación.</string>
+    <string name="test_beta">Prueba la ultima versión Beta</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Comparte con tus amigos</string>
+    <string name="donate">Dona</string>
+    <string name="donate_via_paypal">Donar vía PayPal</string>
+    <string name="translate_crowdin">Traducir en Crowdin</string>
+    <string name="network_linkedin">Red de LinkedIn</string>
+    <string name="search">Buscar</string>
+    <string name="us">Estados Unidos</string>
+    <string name="show_shots_training">Totalidad del Entrenamiento</string>
+    <string name="show_shots_round">Serie actual</string>
+    <string name="show_shots_end">Tanda actual</string>
+    <string name="profile">Perfil</string>
+    <string name="birthday">Fecha de nacimiento</string>
+    <string name="first_name">Nombre</string>
+    <string name="last_name">Apellido(s)</string>
+    <string name="age">Edad</string>
+    <string name="show_signature">Firma</string>
+    <string name="archer">Arquero</string>
+    <string name="hits">Aciertos</string>
+    <string name="misses">Fallos</string>
+    <string name="new_end">Nueva Tanda</string>
+    <string name="distribution">Distribución</string>
+    <string name="count">Cuenta</string>
+    <string name="diameter">Diámetro</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Nivel de zoom</string>
+    <string name="action_pdf">Exportar como PDF</string>
+    <string name="arrow_diameter_scale">Medida de diámetro de Flecha</string>
+    <string name="timestamp">Fecha/Hora</string>
+    <string name="change_target_face">Cambiar el modelo de diana</string>
+    <string name="your_first_training">Su primer entrenamiento</string>
+    <string name="grouping">Agrupamiento</string>
+    <string name="show_clusters">Agrupamiento</string>
+    <string name="first_training_description">Pulse + para iniciar un nuevo entrenamiento.</string>
+    <string name="show_average">Promedio</string>
+    <string name="show_none">Ninguno</string>
+    <string name="left_handed">Zurdo</string>
+    <string name="right_handed">Diestro</string>
+    <string name="keyboard">Teclado</string>
+    <string name="backup_drive_desc">La copia de seguridad de sus datos le permite restaurar todos los entrenamientos en caso de perdida o cambiar tu teléfono.</string>
+    <string name="backup_now">Realizar copia de seguridad</string>
+    <string name="last_backup">Última copia de seguridad: %s</string>
+    <string name="recent_backups">Copias de seguridad recientes</string>
+    <string name="dialog_restore_title">Volver a la versión anterior</string>
+    <string name="restore_desc">Restaurar los datos sobrescribirá todos los datos existentes con la copia de seguridad.</string>
+    <string name="backup_details">Detalles de la Copia de Seguridad</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_location">Ubicación de la Copia de Seguridad</string>
+    <string name="internal_storage">Almacenamiento interno</string>
+    <string name="automatic_backup">Copia de seguridad automática</string>
+    <string name="restoring">Restaurando Copia de Seguridad…</string>
+    <string name="restore_failed">Restauración fallida</string>
+    <string name="delete_failed">Error al borrar</string>
+    <string name="backup_restore_desc">Copiar y restaurar los datos de la aplicación</string>
+    <string name="exporting">Exportando…</string>
+    <string name="loading_backups_failed">¡Error al cargar Copias de Seguridad!</string>
+    <string name="external_storage">Almacenamiento externo</string>
+    <string name="backup_interval">Intervalo de copia de seguridad</string>
+    <string name="daily">Diariamente</string>
+    <string name="weekly">Semanalmente</string>
+    <string name="monthly">Mensualmente</string>
+    <string name="connection_failed">¡Error de conexión!</string>
+    <string name="shooting_indoor">Tiro en sala</string>
+    <string name="bow_rest_vertical_position">Posición vertical</string>
+    <string name="bow_rest">Descansar</string>
+    <string name="bow_rest_horizontal_position">Posición horizontal</string>
+    <string name="bow_cam_settings">Configuración de la Cámara</string>
+    <string name="bow_letoff_weight">Letoff</string>
+    <string name="bow_nocking_point">Punto de Encoque</string>
+    <string name="bow_string">Texto</string>
+    <string name="bow_scope_magnification">Aumentos de visor</string>
+    <string name="bow_rest_stiffness">Rigidez</string>
+    <string name="bow_button">Botón</string>
+    <string name="more_fields">Más campos</string>
+    <string name="recently_used">Usados recientemente</string>
+    <string name="intro_title_track_training_progress">¡Olvídate de las hojas de puntos de papel!</string>
+    <string name="intro_description_track_training_progress">Con un dibujo exacto del lugar de impacto de la flecha, \n puedes conseguir un conocimiento más profundo \n a partir de los datos de entrenamiento.</string>
+    <string name="intro_title_everything_in_one_place">Todo lo que necesitas \n en un lugar</string>
+    <string name="intro_description_everything_in_one_place">Incluyendo arco - flecha-\nand sightmark-gestión, \narchery timer, estadísticas \nand mucho más…</string>
+    <string name="average_arrow_score_per_end">Promedio de puntuaciones por Tanda</string>
+    <string name="show_end">Ver Tanda</string>
+    <string name="show_round">Ver Serie</string>
+    <string name="show_training">Ver Entrenamiento</string>
+    <string name="summary">Resumen</string>
+    <string name="end">Tanda</string>
+    <string name="average_of">Promedio de</string>
+    <string name="displayed_shots">Tiros mostrados</string>
+    <string name="invalid_decimal_number">Numero decimal incorrecto</string>
+    <string name="not_within_expected_range_mm">No dentro del rango esperado de 1 a 20 mm</string>
+    <string name="not_within_expected_range_inch">No dentro del rango esperado de 0 a 1 pulgada</string>
+    <string name="next_round">Próxima Ronda</string>
+    <string name="previous_round">Ronda anterior</string>
+    <string name="overview">Vista global</string>
+    <string name="score">Marcador</string>
+    <string name="show_reached_score">Mostrar puntuación alcanzada</string>
+    <string name="show_total_score">Mostrar puntuación total</string>
+    <string name="show_percentage">Mostrar porcentajes</string>
+    <string name="show_arrow_average">Mostrar promedio de Flechas</string>
+    <string name="image_deleted">Imagen borrada</string>
+    <string name="delete_image">¿Borrar imagen?</string>
+    <string name="keyboard_type">Tipo de teclado</string>
+    <string name="keyboard_enabled">Teclado habilitado</string>
+    <string name="sort_shots">Tiros Rapidos</string>
+    <string name="sort_shots_for_spots">Tiros rapidos a diferentes target faces</string>
+    <string name="target_captain">Capitan de Diana</string>
+    <string name="language">idioma</string>
+    <string name="warning_backup_experimental">Precaución: esta caracteristica es todavia experimental. por favor, revisa regularmente que tu backup se ha realizado exitosamente!</string>
+    <string name="drawer_open">Abrir menu</string>
+    <string name="drawer_close">Cerrar menú</string>
+    <string name="help">Ayuda</string>
+    <string name="home">Inicio</string>
+    <string name="click_to_enter_profile">Haz Click para la informacion del perfil</string>
+    <string name="no_trainings">No tienes ningun entrenamiento todavía!</string>
+    <string name="no_bows">Sin Arcos</string>
+    <string name="no_arrows">Sin Flechas</string>
+    <string name="version_info">Información de la versión</string>
+    <string name="version_prefix">Versión</string>
+    <string name="max_arrow_number">Numero máximo de Flecha</string>
+    <string name="distances">Distancias</string>
+    <string name="diameters">Diametros</string>
+    <string name="bows">Arcos</string>
+    <string name="reset">Resetear</string>
+    <string name="end_x_of_y">Tanda %1$d/%2$d</string>
+    <string name="round_x_of_y">Serie %1$d/%2$d</string>
+    <string name="settings_summary_timer">Ajustar el comportamiento del reloj de tiro</string>
+    <string name="settings_summary_scoreboard">Cambiar la apariencia del marcador</string>
+    <string name="settings_summary_input">Customizar la pantalla de entrada</string>
+    <string name="settings_summary_overview">Personalizar la información mostrada para entrenamientos, entradas y rondas</string>
+    <string name="settings_summary_profile">Introducir información personal</string>
+    <string name="licence_number">Nº de Licencia</string>
+    <string name="file_type">Tipo de Archivo</string>
+    <string name="clear">Limpiar</string>
+    <string name="tap_to_sign">Pulsa para iniciar sesión</string>
+    <string name="pdf_file">Archivo PDF</string>
+    <string name="image_file">Archivo de imagen</string>
+    <string name="settings_summary_statistics">Ajustar la pantalla de estadísticas</string>
+    <string name="settings_statistics_spots_to_single_target">Agregar puntos en una sola diana</string>
+    <string name="keep_above_lockscreen">Mantener sobre la pantalla de bloqueo</string>
+    <string name="scoreboard_title_all_rounds">Todas las entradas</string>
+    <string name="permission_required">Se necesita permiso</string>
+    <string name="backup_permission_explanation"><![CDATA[Para poder hacer un backup de tus datos, la aplicación necesita permiso de aaceso al almacenamiento interno de tu movil. Para usar la opción de backup vete a: 
 Ajustes, aplicaciones > permisos de aplicaciones y habilita \storage\.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 5b7dcf1e8..5722d2392 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Seaded</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Eelmine</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d end</item>
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="one">%d arrow</item>
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Seaded</string>
+    <string name="settings">Seaded</string>
+    <string name="prev">Eelmine</string>
+    <string name="next">Järgmine</string>
+    <string name="save">Salvesta</string>
+    <string name="custom">Kohandatud</string>
+    <string name="training">Treening</string>
+    <string name="bow">Vibu</string>
+    <string name="arrow">Nool</string>
+    <string name="round">Round</string>
+    <string name="points">Punktid</string>
+    <string name="passe">Lõpp</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d arrow selected</item>
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Muuda</string>
+    <string name="delete">Kustuta</string>
+    <string name="statistic">Statistika</string>
+    <!-- Share -->
+    <string name="share">Jaga</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Jagamine ebaõnnestus!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Eksport ebaõnnestus!</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Nimi</string>
+    <string name="bow_type">Bow type</string>
+    <string name="properties">Omadused</string>
+    <string name="brand">Bränd</string>
+    <string name="size">Suurus</string>
+    <string name="description">Kirjeldus</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sight settings</string>
+    <string name="add">Lisa</string>
+    <string name="take_picture">Tehke foto</string>
+    <string name="pick_from_gallery">Select a picture from gallery</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Add arrow</string>
+    <string name="length">Pikkus</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Kaal</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Materjal</string>
+    <!-- New round -->
+    <string name="title">Tiitel</string>
+    <string name="outdoor">Väljas</string>
+    <string name="indoor">Sees</string>
+    <string name="distance">Kaugus</string>
+    <string name="format">Vormindamine</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d end</item>
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="one">%d arrow</item>
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Nooled</string>
+    <string name="sum">Skoor</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Prindi</string>
+    <string name="average">Keskmine</string>
+    <!-- Input mode -->
+    <string name="comment">Kommenteeri</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Vali fail</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import ebaõnnestus!</string>
+    <string name="file_not_found">Faili ei leitud!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Taimer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Laskmise aeg</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Hoiatuse aeg</string>
+    <string name="timer_sound">Heli</string>
+    <string name="timer_vibrate">Vibreeri</string>
+    <!-- Settings -->
+    <string name="backup_action">Varunda</string>
+    <string name="import_action">Impordi</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Versioon %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekundit</item>
+    </plurals>
+    <string name="info">Informatsioon</string>
+    <string name="data">Andmed</string>
+    <string name="weather">Ilm</string>
+    <string name="environment">Keskkond</string>
+    <string name="wind_speed">Tuulekiirus</string>
+    <string name="wind_direction">Tuule suund</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Meetermõõdustik</string>
+    <string name="imperial">Inglise</string>
+    <string name="undo">Tühista</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Kõik lahti/kokku</string>
+    <string name="new_round_template">Uus Template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klubi</string>
+    <string name="target">Sihtkoht</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Harjutused</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Kuupäev</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Ekraan</string>
+    <string name="print">Prindi</string>
+    <string name="table">Tabel</string>
+    <string name="comments">Kommentaarid</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">Teave</string>
+    <string name="general">Üldine</string>
+    <string name="contribute">Toeta proekti</string>
+    <string name="connect">Ühenda</string>
+    <string name="special_thanks_to">Erilised tänud</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Testi uut beeta versiooni</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Jaga oma sõpradega</string>
+    <string name="donate">Toeta</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Otsi</string>
+    <string name="us">USA</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profiil</string>
+    <string name="birthday">Sünnipäev</string>
+    <string name="first_name">Eesnimi</string>
+    <string name="last_name">Perekonnanimi</string>
+    <string name="age">Vanus</string>
+    <string name="show_signature">Allkiri</string>
+    <string name="archer">Vibulaskja</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">Uus seeria</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Arv</string>
+    <string name="diameter">Läbimõõt</string>
+    <string name="input">Sisend</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Ekspordi PDF-ina</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Ajatempel</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Rühmitamine</string>
+    <string name="show_clusters">Klasterid</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Keskmine</string>
+    <string name="show_none">Mitte ükski</string>
+    <string name="left_handed">Vasakukäeline</string>
+    <string name="right_handed">Paremakäeline</string>
+    <string name="keyboard">Klaviatuur</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Varukoopia tegemine</string>
+    <string name="last_backup">Viimane varundamine: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Taasta</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Sisemälu</string>
+    <string name="automatic_backup">Automaatne varundus</string>
+    <string name="restoring">Varukoopia taastamine...</string>
+    <string name="restore_failed">Taastamine nurjus</string>
+    <string name="delete_failed">Kustutamine ebaõnnestus</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Eksportimine...</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">Väline salvestusruum</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Päevane</string>
+    <string name="weekly">Nädalane</string>
+    <string name="monthly">Kuine</string>
+    <string name="connection_failed">Ühendus nurjus!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertikaalne positsioon</string>
+    <string name="bow_rest">Ülejäänud</string>
+    <string name="bow_rest_horizontal_position">Horisontaalne positsioon</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Nupp</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Viimati kasutatud</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Kokkuvõte</string>
+    <string name="end">Lõpp</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Ülevaade</string>
+    <string name="score">Skoor</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Kuva protsent</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Kustutada pilt?</string>
+    <string name="keyboard_type">Klaviatuuri tüüp</string>
+    <string name="keyboard_enabled">Klaviatuur lubatud</string>
+    <string name="sort_shots">Sorteeri lasud</string>
+    <string name="sort_shots_for_spots">Sorteeri lasud märklaua tabamise järgi</string>
+    <string name="target_captain">Märklaua kapten</string>
+    <string name="language">Keel</string>
+    <string name="warning_backup_experimental">Hoiatus: See funktsioon on endiselt eksperimentaalne! Kontrollige, kas andmed on hiljuti varundatud!</string>
+    <string name="drawer_open">Ava sahtel</string>
+    <string name="drawer_close">Sulge sahtel</string>
+    <string name="help">Abi</string>
+    <string name="home">Avaleht</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Versiooni teave</string>
+    <string name="version_prefix">Versioon</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Vahemaad</string>
+    <string name="diameters">Läbimõõdud</string>
+    <string name="bows">Vibud</string>
+    <string name="reset">Lähtesta</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Sisesta personaalne informatsioon</string>
+    <string name="licence_number">Litsentsi number</string>
+    <string name="file_type">Faili tüüp</string>
+    <string name="clear">Tühjenda</string>
+    <string name="tap_to_sign">Toksa logimiseks</string>
+    <string name="pdf_file">PDF fail</string>
+    <string name="image_file">Pildifail</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">Kõik voorud</string>
+    <string name="permission_required">Vajalik on luba</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9ff2d3ccc..0bfd354c8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Asetukset</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Edellinen</string>
-  <string name="next">Seuraava</string>
-  <string name="save">Tallenna</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Jousi</string>
-  <string name="arrow">Nuoli</string>
-  <string name="round">Kierros</string>
-  <string name="points">Pisteet</string>
-  <string name="passe">Sarja</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">Uusi jousi</string>
-  <string name="new_arrow">Uusi nuoli</string>
-  <string name="new_round">Uusi kierros</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d nuoli valittu</item>
-    <item quantity="other">%d nuolia valittu</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d sarja valittu</item>
-    <item quantity="other">%d sarjaa valittu</item>
-  </plurals>
-  <string name="edit">Muokkaa</string>
-  <string name="delete">Poista</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Jaa</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Lisää jousi</string>
-  <string name="name">Nimi</string>
-  <string name="bow_type">Jousten laji</string>
-  <string name="properties">Ominaisuudet</string>
-  <string name="brand">Merkki</string>
-  <string name="size">Koko</string>
-  <string name="description">Kuvaus</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Tähtäin-asetukset</string>
-  <string name="add">Lisää</string>
-  <string name="take_picture">Ota kuva</string>
-  <string name="pick_from_gallery">Valitse kuva galleriasta</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Lisää nuoli</string>
-  <string name="length">Pituus</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Paino</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nokki</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d sarja</item>
-    <item quantity="other">%d sarjaa</item>
-  </plurals>
-  <string name="with">/</string>
-  <plurals name="arrow">
-    <item quantity="one">%d nuoli</item>
-    <item quantity="other">%d nuolia</item>
-  </plurals>
-  <string name="target_face">Maalitaulu</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Nuolet</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Tulosta</string>
-  <string name="average">Keskiarvo</string>
-  <!-- Input mode -->
-  <string name="comment">Kommentti</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Valitse tiedosto</string>
-  <string name="dir_not_created">Kansion louminen ei onnistunut!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Lahjoittaa minulle hampurilainen</string>
-  <string name="donate_5">Lahjoittaa minulle kebab</string>
-  <string name="donate_10">Lahjoittaa minulle suuri pizza</string>
-  <string name="donate_20">Lahjoittaa minulle bensaa</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Aloittaa koskemalla</string>
-  <string name="preparation">Valmistaudu</string>
-  <string name="shooting">Ammunta</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Ääni</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Varmuuskopio</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Vie CSV:nä</string>
-  <string name="licences">Open Source Lisenssit</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Tiedot</string>
-  <string name="data">Tiedot</string>
-  <string name="weather">Sää</string>
-  <string name="environment">Ympäristö</string>
-  <string name="wind_speed">Tuulennopeus</string>
-  <string name="wind_direction">Tuulensuunta</string>
-  <string name="sight_setting_removed">Tähtäinasetukset poistettu!</string>
-  <string name="metric">Metrinen</string>
-  <string name="imperial">Brittiläinen</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">Uusi mallipohja</string>
-  <string name="arrow_numbers">Nuolien numerot</string>
-  <string name="round_removed">Kierros poistettu!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Klubi</string>
-  <string name="target">Maali</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Harjoitus</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d nuoli poistettu</item>
-    <item quantity="other">%d nuolia poistettu</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d jousi poistettu</item>
-    <item quantity="other">%d jousia poistettu</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d kierros valittu</item>
-    <item quantity="other">%d kierrosta valittu</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d kierros poistettu</item>
-    <item quantity="other">%d kierrosta poistettu</item>
-  </plurals>
-  <string name="date">Päivämäärä</string>
-  <string name="edit_round">Muokkaa kierros</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Tähtäin</string>
-  <string name="limbs">Lavat</string>
-  <string name="my_bow">Oma jousi</string>
-  <string name="my_arrow">Oma nuoli</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Nuoli %1$s %2$s:sta</string>
-  <string name="display">Display</string>
-  <string name="print">Tulosta</string>
-  <string name="table">Table</string>
-  <string name="comments">Kommentit</string>
-  <string name="show_points_colored">Näytä pisteet värillinen</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Klikkeri</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Yhdistä</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Lahjoita</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Syntymäpäivä</string>
-  <string name="first_name">Etunimi</string>
-  <string name="last_name">Sukunimi</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Allekirjoitus</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Määrä</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Vaihda maalitaulu</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Paina plussia aloittamaan uutta koulutusta.</string>
-  <string name="show_average">Keskiarvo</string>
-  <string name="show_none">Ei mitään</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Näppäimistö</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">Jänne</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Näytä sarja</string>
-  <string name="show_round">Näytä kierros</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Ensi kierros</string>
-  <string name="previous_round">Edellinen kierros</string>
-  <string name="overview">Overview</string>
-  <string name="score">Pisteet</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Kuva poistettu</string>
-  <string name="delete_image">Poista kuva?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Sarja %1$d/%2$d</string>
-  <string name="round_x_of_y">Kierros %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Asetukset</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Edellinen</string>
+    <string name="next">Seuraava</string>
+    <string name="save">Tallenna</string>
+    <string name="custom">Custom</string>
+    <string name="training">Training</string>
+    <string name="bow">Jousi</string>
+    <string name="arrow">Nuoli</string>
+    <string name="round">Kierros</string>
+    <string name="points">Pisteet</string>
+    <string name="passe">Sarja</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">Uusi jousi</string>
+    <string name="new_arrow">Uusi nuoli</string>
+    <string name="new_round">Uusi kierros</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d nuoli valittu</item>
+        <item quantity="other">%d nuolia valittu</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d sarja valittu</item>
+        <item quantity="other">%d sarjaa valittu</item>
+    </plurals>
+    <string name="edit">Muokkaa</string>
+    <string name="delete">Poista</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Jaa</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Exporting failed!</string>
+    <!-- New bow -->
+    <string name="add_bow">Lisää jousi</string>
+    <string name="name">Nimi</string>
+    <string name="bow_type">Jousten laji</string>
+    <string name="properties">Ominaisuudet</string>
+    <string name="brand">Merkki</string>
+    <string name="size">Koko</string>
+    <string name="description">Kuvaus</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Tähtäin-asetukset</string>
+    <string name="add">Lisää</string>
+    <string name="take_picture">Ota kuva</string>
+    <string name="pick_from_gallery">Valitse kuva galleriasta</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Lisää nuoli</string>
+    <string name="length">Pituus</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Paino</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nokki</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d sarja</item>
+        <item quantity="other">%d sarjaa</item>
+    </plurals>
+    <string name="with">/</string>
+    <plurals name="arrow">
+        <item quantity="one">%d nuoli</item>
+        <item quantity="other">%d nuolia</item>
+    </plurals>
+    <string name="target_face">Maalitaulu</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Nuolet</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Tulosta</string>
+    <string name="average">Keskiarvo</string>
+    <!-- Input mode -->
+    <string name="comment">Kommentti</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Valitse tiedosto</string>
+    <string name="dir_not_created">Kansion louminen ei onnistunut!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Lahjoittaa minulle hampurilainen</string>
+    <string name="donate_5">Lahjoittaa minulle kebab</string>
+    <string name="donate_10">Lahjoittaa minulle suuri pizza</string>
+    <string name="donate_20">Lahjoittaa minulle bensaa</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Aloittaa koskemalla</string>
+    <string name="preparation">Valmistaudu</string>
+    <string name="shooting">Ammunta</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Ääni</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Varmuuskopio</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Vie CSV:nä</string>
+    <string name="licences">Open Source Lisenssit</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Tiedot</string>
+    <string name="data">Tiedot</string>
+    <string name="weather">Sää</string>
+    <string name="environment">Ympäristö</string>
+    <string name="wind_speed">Tuulennopeus</string>
+    <string name="wind_direction">Tuulensuunta</string>
+    <string name="sight_setting_removed">Tähtäinasetukset poistettu!</string>
+    <string name="metric">Metrinen</string>
+    <string name="imperial">Brittiläinen</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">Uusi mallipohja</string>
+    <string name="arrow_numbers">Nuolien numerot</string>
+    <string name="round_removed">Kierros poistettu!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klubi</string>
+    <string name="target">Maali</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Harjoitus</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d nuoli poistettu</item>
+        <item quantity="other">%d nuolia poistettu</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d jousi poistettu</item>
+        <item quantity="other">%d jousia poistettu</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d kierros valittu</item>
+        <item quantity="other">%d kierrosta valittu</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d kierros poistettu</item>
+        <item quantity="other">%d kierrosta poistettu</item>
+    </plurals>
+    <string name="date">Päivämäärä</string>
+    <string name="edit_round">Muokkaa kierros</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Tähtäin</string>
+    <string name="limbs">Lavat</string>
+    <string name="my_bow">Oma jousi</string>
+    <string name="my_arrow">Oma nuoli</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Nuoli %1$s %2$s:sta</string>
+    <string name="display">Display</string>
+    <string name="print">Tulosta</string>
+    <string name="table">Table</string>
+    <string name="comments">Kommentit</string>
+    <string name="show_points_colored">Näytä pisteet värillinen</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Klikkeri</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Yhdistä</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Lahjoita</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Syntymäpäivä</string>
+    <string name="first_name">Etunimi</string>
+    <string name="last_name">Sukunimi</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Allekirjoitus</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Määrä</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Vaihda maalitaulu</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Paina plussia aloittamaan uutta koulutusta.</string>
+    <string name="show_average">Keskiarvo</string>
+    <string name="show_none">Ei mitään</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Näppäimistö</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">Jänne</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Näytä sarja</string>
+    <string name="show_round">Näytä kierros</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Ensi kierros</string>
+    <string name="previous_round">Edellinen kierros</string>
+    <string name="overview">Overview</string>
+    <string name="score">Pisteet</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Kuva poistettu</string>
+    <string name="delete_image">Poista kuva?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Sarja %1$d/%2$d</string>
+    <string name="round_x_of_y">Kierros %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8ed8e8ad0..497a80725 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Paramètres</string>
-  <string name="prev">Précédent</string>
-  <string name="next">Suivant</string>
-  <string name="save">Enregistrer</string>
-  <string name="custom">Personnaliser</string>
-  <string name="training">Entraînement</string>
-  <string name="bow">Arc</string>
-  <string name="arrow">Flèches</string>
-  <string name="round">Série</string>
-  <string name="points">Points</string>
-  <string name="passe">Volée</string>
-  <!-- Overview -->
-  <string name="new_training">Nouvel entraînement</string>
-  <string name="new_bow">Nouvel Arc</string>
-  <string name="new_arrow">Nouvelle flèche</string>
-  <string name="new_round">Nouvelle série</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d entraînement sélectionné</item>
-    <item quantity="other">%d entraînements sélectionnés</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d arc sélectionné</item>
-    <item quantity="other">%d arcs sélectionnés</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d flèche sélectionnée</item>
-    <item quantity="other">%d flèches sélectionnées</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d volée sélectionnée</item>
-    <item quantity="other">%d volées sélectionnées</item>
-  </plurals>
-  <string name="edit">Modifier</string>
-  <string name="delete">Effacer</string>
-  <string name="statistic">Statistique</string>
-  <!-- Share -->
-  <string name="share">Partager</string>
-  <string name="dispersion_pattern">Diagramme de dispersion</string>
-  <string name="sharing_failed">Échec du partage!</string>
-  <!-- Export -->
-  <string name="send_exported">Envoyer les données exportées</string>
-  <string name="exporting_failed">L\'export n\'a pas fonctionné!</string>
-  <!-- New bow -->
-  <string name="add_bow">Ajouter un arc</string>
-  <string name="name">Nom</string>
-  <string name="bow_type">Type d\'arc</string>
-  <string name="properties">Propriétés</string>
-  <string name="brand">Marque</string>
-  <string name="size">Taille</string>
-  <string name="description">Description</string>
-  <string name="height">Band</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Réglages du viseur</string>
-  <string name="add">Ajouter</string>
-  <string name="take_picture">Prendre une photo</string>
-  <string name="pick_from_gallery">Choisir une photo dans la galerie</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Ajouter une flèche</string>
-  <string name="length">Longueur</string>
-  <string name="spine">Rigidité (Spine)</string>
-  <string name="weight">Poids</string>
-  <string name="vanes">Empennage</string>
-  <string name="nock">Encoche</string>
-  <string name="material">Matériau</string>
-  <!-- New round -->
-  <string name="title">Titre</string>
-  <string name="outdoor">Extérieur</string>
-  <string name="indoor">Intérieur</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d volée</item>
-    <item quantity="other">%d volées</item>
-  </plurals>
-  <string name="with">de</string>
-  <plurals name="arrow">
-    <item quantity="one">%d flèche</item>
-    <item quantity="other">%d flèches</item>
-  </plurals>
-  <string name="target_face">Blason</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Feuille de marque</string>
-  <string name="arrows">Flèches</string>
-  <string name="sum">Somme</string>
-  <string name="carry">Cumul</string>
-  <string name="action_print">Imprimer</string>
-  <string name="average">Moyenne</string>
-  <!-- Input mode -->
-  <string name="comment">Commentaire</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Choisir un fichier</string>
-  <string name="dir_not_created"> Le répertoire ne peut pas être créé!</string>
-  <string name="import_failed">L\'import a échoué!</string>
-  <string name="file_not_found">Fichier non trouvé!</string>
-  <string name="failed_reading_file">Echec de la lecture du fichier!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donner un Hamburger</string>
-  <string name="donate_5">Donner un kebab</string>
-  <string name="donate_10">Donner une grande pizza</string>
-  <string name="donate_20">Donner de l\'essence</string>
-  <string name="donation_thank">Merci pour votre soutient!</string>
-  <string name="donate_text" formatted="false">Les montants inclus la TVA et 30% de commission pour Google. Si vous préférez, vous pouvez également faire un don PayPal sur le compte dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Chronomètre</string>
-  <string name="touch_to_start">Appuyer pour démarrer</string>
-  <string name="preparation">Préparation</string>
-  <string name="shooting">Tir</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Temps de tir</string>
-  <string name="timer_waiting_time">Temps de préparation</string>
-  <string name="timer_warning_time">temps orange</string>
-  <string name="timer_sound">Sons</string>
-  <string name="timer_vibrate">Vibration</string>
-  <!-- Settings -->
-  <string name="backup_action">Sauvegarde</string>
-  <string name="import_action">Importer</string>
-  <string name="exports_as_csv">Exporter en CSV</string>
-  <string name="licences">Licences - Open Source</string>
-  <string name="licences_summary">Notes légales sur les licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d seconde</item>
-    <item quantity="other">%d secondes</item>
-  </plurals>
-  <string name="info">Informations</string>
-  <string name="data">Données</string>
-  <string name="weather">Météo</string>
-  <string name="environment">Environnement</string>
-  <string name="wind_speed">Vitesse du vent</string>
-  <string name="wind_direction">Direction du vent</string>
-  <string name="sight_setting_removed">Réglage du viseur effacé!</string>
-  <string name="metric">Métrique</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Annuler</string>
-  <string name="standard_rounds">Épreuves standards</string>
-  <string name="expand_collapse">Développer/réduire</string>
-  <string name="new_round_template">Nouveau modèle</string>
-  <string name="arrow_numbers">Numéros de flèche</string>
-  <string name="round_removed">Série effacée !</string>
-  <string name="custom_round">Série personnalisée</string>
-  <string name="filter">Filtre</string>
-  <string name="club">Compagnie/Club</string>
-  <string name="target">Cible</string>
-  <string name="standard_round">Épreuve standard</string>
-  <string name="use_as_template">Utiliser comme modèle?</string>
-  <string name="create_copy">Ceci est une manche standard\nVoulez-vous en créer une copie afin de l\'éditée?</string>
-  <string name="practice">Entraînement</string>
-  <string name="edit_training">Modifier la séance</string>
-  <string name="edit_standard_round">Modifier l\'épreuve standard</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d flèche effacée</item>
-    <item quantity="other">%d flèches supprimés</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d arc effacé</item>
-    <item quantity="other">%d arcs supprimés</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d séance effacée</item>
-    <item quantity="other">%d séances effacées</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d extrémité supprimée</item>
-    <item quantity="other">extrémités %d supprimées</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Série %d</item>
-    <item quantity="other">Série %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d Série sélectionnée</item>
-    <item quantity="other">%d Séries sélectionnées</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d série effacée</item>
-    <item quantity="other">%d séries effacées</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Modifier la série</string>
-  <string name="draw_weight">Puissance</string>
-  <string name="sight">Viseur</string>
-  <string name="limbs">Branches</string>
-  <string name="my_bow">Mon arc</string>
-  <string name="my_arrow">Ma flèche</string>
-  <string name="tip_weight">Poids de la pointe</string>
-  <string name="arrow_ranking">Classement des flêches</string>
-  <string name="arrow_x_of_set_of_arrows">Flèche %1$s sur %2$s</string>
-  <string name="display">Afficher</string>
-  <string name="print">Imprimer</string>
-  <string name="table">Tableau</string>
-  <string name="comments">Commentaires</string>
-  <string name="show_points_colored">Afficher les points de couleur</string>
-  <string name="stabilizer">Stabilisateur</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Flèche numéro %s</string>
-  <string name="training_with_standard_round">Entraînement avec série standard</string>
-  <string name="free_training">Entraînement libre</string>
-  <string name="competition">Compétition</string>
-  <string name="about">A propos de</string>
-  <string name="general">Générale</string>
-  <string name="contribute">Contribuer</string>
-  <string name="connect">Se connecter</string>
-  <string name="special_thanks_to">Merci tout particulièrement à</string>
-  <string name="all_translators">Toutes les personnes, qui ont aidé à traduire l’app !</string>
-  <string name="all_beta_testers">Tous ceux qui ont rejoint le groupe de bêta-testeurs et ont contribué à l\'amélioration continue de l\'app.</string>
-  <string name="test_beta">Tester la dernière bêta-version</string>
-  <string name="join_on_google_plus">Rejoignez-nous sur Google+</string>
-  <string name="share_with_friends">Partagez avec vos amis</string>
-  <string name="donate">Faire un don</string>
-  <string name="donate_via_paypal">Faire un don par PayPal</string>
-  <string name="translate_crowdin">Traduire sur Crowdin</string>
-  <string name="network_linkedin">Connecter avec LinkedIn</string>
-  <string name="search">Rechercher</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Entrainement complet</string>
-  <string name="show_shots_round">Série en cours</string>
-  <string name="show_shots_end">Fin actuelle</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Anniversaire</string>
-  <string name="first_name">Prénom</string>
-  <string name="last_name">Nom</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Marquées</string>
-  <string name="misses">Manquées</string>
-  <string name="new_end">Nouvelle fin</string>
-  <string name="distribution">Répartition</string>
-  <string name="count">Décompte</string>
-  <string name="diameter">Diamètre</string>
-  <string name="input">Saisie</string>
-  <string name="target_zoom">Niveau de zoom de cible</string>
-  <string name="action_pdf">Exporter en PDF</string>
-  <string name="arrow_diameter_scale">Échelle de diamètre de flèche</string>
-  <string name="timestamp">Date et heure</string>
-  <string name="change_target_face">Changer de blason</string>
-  <string name="your_first_training">Votre première entrainement</string>
-  <string name="grouping">Groupement</string>
-  <string name="show_clusters">Groupe</string>
-  <string name="first_training_description">Appuyez sur le plus pour commencer un nouveau entrainement.</string>
-  <string name="show_average">Moyenne</string>
-  <string name="show_none">Vide</string>
-  <string name="left_handed">Gaucher</string>
-  <string name="right_handed">Droitier</string>
-  <string name="keyboard">Clavier</string>
-  <string name="backup_drive_desc">Sauvegardez vos données pour restaurer toutes vos séances en cas de perte ou de changement de mobile.</string>
-  <string name="backup_now">Copier maintenant</string>
-  <string name="last_backup">Dernière sauvegarde : %s</string>
-  <string name="recent_backups">Sauvegardes récentes</string>
-  <string name="dialog_restore_title">Revenir à la version précédente</string>
-  <string name="restore_desc">Restaurer les données va remplacer toutes les données existantes par celles de la sauvegarde.</string>
-  <string name="backup_details">Détails de la sauvegarde</string>
-  <string name="restore">Restaurer</string>
-  <string name="backup_location">Emplacement de la sauvegarde</string>
-  <string name="internal_storage">Disque dur interne</string>
-  <string name="automatic_backup">Sauvegarde automatique</string>
-  <string name="restoring">Restauration de la sauvegarde…</string>
-  <string name="restore_failed">Echec de la restauration</string>
-  <string name="delete_failed">Echec de la suppression</string>
-  <string name="backup_restore_desc">Sauvegarde et restauration des données de l\'app</string>
-  <string name="exporting">Exportation…</string>
-  <string name="loading_backups_failed">Échec de chargement des sauvegardes !</string>
-  <string name="external_storage">Disque dur externe</string>
-  <string name="backup_interval">Intervalle de sauvegarde</string>
-  <string name="daily">Quotidien</string>
-  <string name="weekly">Hebdomadaire</string>
-  <string name="monthly">Mensuel</string>
-  <string name="connection_failed">Echec de la connexion !</string>
-  <string name="shooting_indoor">Tir en salle</string>
-  <string name="bow_rest_vertical_position">Position verticale</string>
-  <string name="bow_rest">Repose flèche</string>
-  <string name="bow_rest_horizontal_position">Position horizontale</string>
-  <string name="bow_cam_settings">Paramètres des poulies</string>
-  <string name="bow_letoff_weight">Pourcentage de la puissance résiduelle à pleine allonge</string>
-  <string name="bow_nocking_point">Nockset</string>
-  <string name="bow_string">Corde</string>
-  <string name="bow_scope_magnification">Zoom du scope</string>
-  <string name="bow_rest_stiffness">Rigidité</string>
-  <string name="bow_button">Berger button</string>
-  <string name="more_fields">Autres champs</string>
-  <string name="recently_used">Utilisé récemment</string>
-  <string name="intro_title_track_training_progress">Oublier la feuille de scores !</string>
-  <string name="intro_description_track_training_progress">Avec un suivi précis de vos flèches, vous pouvez tirer plus d\'enseignements de vos données d\'entrainement.</string>
-  <string name="intro_title_everything_in_one_place">Tout ce qu\'il vous faut\nen un endroit</string>
-  <string name="intro_description_everything_in_one_place">Incluant la gestion de l\'arc , des flèches, des réglages de visée, chronomètre, statistiques, et bien plus…</string>
-  <string name="average_arrow_score_per_end">Score moyen des flèches par volée</string>
-  <string name="show_end">Affichage sur la volée</string>
-  <string name="show_round">Affichage sur la serie</string>
-  <string name="show_training">Affichage sur l\'entraînement</string>
-  <string name="summary">Résumé</string>
-  <string name="end">Volée</string>
-  <string name="average_of">La moyenne de</string>
-  <string name="displayed_shots">Tirs affichés</string>
-  <string name="invalid_decimal_number">Nombre décimal non valide</string>
-  <string name="not_within_expected_range_mm">Pas dans l\'intervalle prévu de 1 à 20mm</string>
-  <string name="not_within_expected_range_inch">Pas dans l\'intervalle attendu de 0 à 1 pouce</string>
-  <string name="next_round">Série suivante</string>
-  <string name="previous_round">Série précédente</string>
-  <string name="overview">Résumé</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Afficher le score</string>
-  <string name="show_total_score">Voir le score total</string>
-  <string name="show_percentage">Voir le pourcentage</string>
-  <string name="show_arrow_average">Afficher la moyenne par flèche</string>
-  <string name="image_deleted">Image supprimée</string>
-  <string name="delete_image">Supprimer l\'Image?</string>
-  <string name="keyboard_type">Type de clavier</string>
-  <string name="keyboard_enabled">Clavier activé</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Marqueur</string>
-  <string name="language">Langue</string>
-  <string name="warning_backup_experimental">Attention : Cette fonctionnalité est encore expérimentale ! Veuillez vérifier régulièrement si la sauvegarde a été vraiment réussie !</string>
-  <string name="drawer_open">Ouvrir le panneau latéral</string>
-  <string name="drawer_close">Fermer le panneau latéral</string>
-  <string name="help">Aide</string>
-  <string name="home">Accueil</string>
-  <string name="click_to_enter_profile">Cliquer pour ajouter vos informations personnelles</string>
-  <string name="no_trainings">Vous n\'avez pas encore d\'entraînement!</string>
-  <string name="no_bows">Pas d\'arc</string>
-  <string name="no_arrows">Pas de flèche</string>
-  <string name="version_info">Informations de version</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Nombre de flèches maximal</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diamètres</string>
-  <string name="bows">Arcs</string>
-  <string name="reset">Réinitialiser</string>
-  <string name="end_x_of_y">Volée %1$d/%2$d</string>
-  <string name="round_x_of_y">Série %1$d/%2$d</string>
-  <string name="settings_summary_timer">Régler le comportement de la minuterie</string>
-  <string name="settings_summary_scoreboard">Changer l’apparence du tableau de scores</string>
-  <string name="settings_summary_input">Personnaliser l’écran de saisie</string>
-  <string name="settings_summary_overview">Personnaliser les informations affichées pour les entraienements, les séries et les volées</string>
-  <string name="settings_summary_profile">Entrer vosinformations personnelles</string>
-  <string name="licence_number">Numéro de licence</string>
-  <string name="file_type">Type de fichier</string>
-  <string name="clear">Effacer</string>
-  <string name="tap_to_sign">Appuyez pour vous connecter</string>
-  <string name="pdf_file">Fichier PDF</string>
-  <string name="image_file">Fichier image</string>
-  <string name="settings_summary_statistics">Régler l’écran des statistiques</string>
-  <string name="settings_statistics_spots_to_single_target">Agréger tous les impacts sur une seule cible</string>
-  <string name="keep_above_lockscreen">Au-dessus de l\'écran de verrouillage</string>
-  <string name="scoreboard_title_all_rounds">Toutes les séries</string>
-  <string name="permission_required">Autorisation nécessaire</string>
-  <string name="backup_permission_explanation"><![CDATA[Pour être capable de sauver vos données, l\'application a besoin de l\'autorisation d\'accèder au stockage interne de votre téléphone. Pour utiliser la fonctionalité de backup, allez dans les paramètres systême > Apps > MyTargets > Autorisations et activez le paramètre \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Options</string>
+    <string name="settings">Paramètres</string>
+    <string name="prev">Précédent</string>
+    <string name="next">Suivant</string>
+    <string name="save">Enregistrer</string>
+    <string name="custom">Personnaliser</string>
+    <string name="training">Entraînement</string>
+    <string name="bow">Arc</string>
+    <string name="arrow">Flèches</string>
+    <string name="round">Série</string>
+    <string name="points">Points</string>
+    <string name="passe">Volée</string>
+    <!-- Overview -->
+    <string name="new_training">Nouvel entraînement</string>
+    <string name="new_bow">Nouvel Arc</string>
+    <string name="new_arrow">Nouvelle flèche</string>
+    <string name="new_round">Nouvelle série</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d entraînement sélectionné</item>
+        <item quantity="other">%d entraînements sélectionnés</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d arc sélectionné</item>
+        <item quantity="other">%d arcs sélectionnés</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d flèche sélectionnée</item>
+        <item quantity="other">%d flèches sélectionnées</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d volée sélectionnée</item>
+        <item quantity="other">%d volées sélectionnées</item>
+    </plurals>
+    <string name="edit">Modifier</string>
+    <string name="delete">Effacer</string>
+    <string name="statistic">Statistique</string>
+    <!-- Share -->
+    <string name="share">Partager</string>
+    <string name="dispersion_pattern">Diagramme de dispersion</string>
+    <string name="sharing_failed">Échec du partage !</string>
+    <!-- Export -->
+    <string name="send_exported">Envoyer les données exportées</string>
+    <string name="exporting_failed">L\'export n\'a pas fonctionné!</string>
+    <!-- New bow -->
+    <string name="add_bow">Ajouter un arc</string>
+    <string name="name">Nom</string>
+    <string name="bow_type">Type d\'arc</string>
+    <string name="properties">Propriétés</string>
+    <string name="brand">Marque</string>
+    <string name="size">Taille</string>
+    <string name="description">Description</string>
+    <string name="height">Band</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Réglages du viseur</string>
+    <string name="add">Ajouter</string>
+    <string name="take_picture">Prendre une photo</string>
+    <string name="pick_from_gallery">Choisir une photo dans la galerie</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Ajouter une flèche</string>
+    <string name="length">Longueur</string>
+    <string name="spine">Rigidité (Spine)</string>
+    <string name="weight">Poids</string>
+    <string name="vanes">Empennage</string>
+    <string name="nock">Encoche</string>
+    <string name="material">Matériau</string>
+    <!-- New round -->
+    <string name="title">Titre</string>
+    <string name="outdoor">Extérieur</string>
+    <string name="indoor">Intérieur</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d volée</item>
+        <item quantity="other">%d volées</item>
+    </plurals>
+    <string name="with">de</string>
+    <plurals name="arrow">
+        <item quantity="one">%d flèche</item>
+        <item quantity="other">%d flèches</item>
+    </plurals>
+    <string name="target_face">Blason</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Feuille de marque</string>
+    <string name="arrows">Flèches</string>
+    <string name="sum">Somme</string>
+    <string name="carry">Cumul</string>
+    <string name="action_print">Imprimer</string>
+    <string name="average">Moyenne</string>
+    <!-- Input mode -->
+    <string name="comment">Commentaire</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Choisir un fichier</string>
+    <string name="dir_not_created"> Le répertoire ne peut pas être créé!</string>
+    <string name="import_failed">L\'import a échoué!</string>
+    <string name="file_not_found">Fichier non trouvé!</string>
+    <string name="failed_reading_file">Echec de la lecture du fichier!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donner un Hamburger</string>
+    <string name="donate_5">Donner un kebab</string>
+    <string name="donate_10">Donner une grande pizza</string>
+    <string name="donate_20">Donner de l\'essence</string>
+    <string name="donation_thank">Merci pour votre soutient!</string>
+    <string name="donate_text" formatted="false">Les montants inclus la TVA et 30% de commission pour Google. Si vous préférez, vous pouvez également faire un don PayPal sur le compte dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Chronomètre</string>
+    <string name="touch_to_start">Appuyer pour démarrer</string>
+    <string name="preparation">Préparation</string>
+    <string name="shooting">Tir</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Temps de tir</string>
+    <string name="timer_waiting_time">Temps de préparation</string>
+    <string name="timer_warning_time">temps orange</string>
+    <string name="timer_sound">Sons</string>
+    <string name="timer_vibrate">Vibration</string>
+    <!-- Settings -->
+    <string name="backup_action">Sauvegarde</string>
+    <string name="import_action">Importer</string>
+    <string name="exports_as_csv">Exporter au format CSV</string>
+    <string name="licences">Licences - Open Source</string>
+    <string name="licences_summary">Notes légales sur les licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d secondes</item>
+    </plurals>
+    <string name="info">Informations</string>
+    <string name="data">Données</string>
+    <string name="weather">Météo</string>
+    <string name="environment">Environnement</string>
+    <string name="wind_speed">Vitesse du vent</string>
+    <string name="wind_direction">Direction du vent</string>
+    <string name="sight_setting_removed">Réglage du viseur effacé !</string>
+    <string name="metric">Métrique</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Annuler</string>
+    <string name="standard_rounds">Épreuves standards</string>
+    <string name="expand_collapse">Développer/réduire</string>
+    <string name="new_round_template">Nouveau modèle</string>
+    <string name="arrow_numbers">Numéros de flèche</string>
+    <string name="round_removed">Série effacée !</string>
+    <string name="custom_round">Série personnalisée</string>
+    <string name="filter">Filtre</string>
+    <string name="club">Compagnie/Club</string>
+    <string name="target">Cible</string>
+    <string name="standard_round">Épreuve standard</string>
+    <string name="use_as_template">Utiliser comme modèle?</string>
+    <string name="create_copy">Ceci est une manche standard\nVoulez-vous en créer une copie afin de l\'éditée?</string>
+    <string name="practice">Entraînement</string>
+    <string name="edit_training">Modifier la séance</string>
+    <string name="edit_standard_round">Modifier l\'épreuve standard</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d flèche effacée</item>
+        <item quantity="other">%d flèches supprimés</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d arc effacé</item>
+        <item quantity="other">%d arcs supprimés</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d séance effacée</item>
+        <item quantity="other">%d séances effacées</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d extrémité supprimée</item>
+        <item quantity="other">extrémités %d supprimées</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Série %d</item>
+        <item quantity="other">Série %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d Série sélectionnée</item>
+        <item quantity="other">%d Séries sélectionnées</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d série effacée</item>
+        <item quantity="other">%d séries effacées</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Modifier la série</string>
+    <string name="draw_weight">Puissance</string>
+    <string name="sight">Viseur</string>
+    <string name="limbs">Branches</string>
+    <string name="my_bow">Mon arc</string>
+    <string name="my_arrow">Ma flèche</string>
+    <string name="tip_weight">Poids de la pointe</string>
+    <string name="arrow_ranking">Classement des flèches</string>
+    <string name="arrow_x_of_set_of_arrows">Flèche %1$s sur %2$s</string>
+    <string name="display">Afficher</string>
+    <string name="print">Imprimer</string>
+    <string name="table">Tableau</string>
+    <string name="comments">Commentaires</string>
+    <string name="show_points_colored">Afficher les points en couleur</string>
+    <string name="stabilizer">Stabilisateur</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Flèche numéro %s</string>
+    <string name="training_with_standard_round">Entraînement avec série standard</string>
+    <string name="free_training">Entraînement libre</string>
+    <string name="competition">Compétition</string>
+    <string name="about">A propos de</string>
+    <string name="general">Générale</string>
+    <string name="contribute">Contribuer</string>
+    <string name="connect">Se connecter</string>
+    <string name="special_thanks_to">Remerciements spéciaux à</string>
+    <string name="all_translators">Toutes les personnes, qui ont aidé à traduire l’application !</string>
+    <string name="all_beta_testers">Tous le membres du groupe des bêta-testeurs qui ont régulièrement contribué à améliorer l\'app.</string>
+    <string name="test_beta">Tester la dernière version bêta</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Partagez avec vos amis</string>
+    <string name="donate">Faire un don</string>
+    <string name="donate_via_paypal">Faire un don sur PayPal</string>
+    <string name="translate_crowdin">Traduire sur Crowdin</string>
+    <string name="network_linkedin">Connecter avec LinkedIn</string>
+    <string name="search">Rechercher</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Entrainement complet</string>
+    <string name="show_shots_round">Série en cours</string>
+    <string name="show_shots_end">Fin actuelle</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Anniversaire</string>
+    <string name="first_name">Prénom</string>
+    <string name="last_name">Nom</string>
+    <string name="age">Âge</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Touches</string>
+    <string name="misses">Manquées</string>
+    <string name="new_end">Nouvelle fin</string>
+    <string name="distribution">Répartition</string>
+    <string name="count">Décompte</string>
+    <string name="diameter">Diamètre</string>
+    <string name="input">Saisie</string>
+    <string name="target_zoom">Niveau de zoom de cible</string>
+    <string name="action_pdf">Exporter en PDF</string>
+    <string name="arrow_diameter_scale">Échelle du diamètre de la flèche</string>
+    <string name="timestamp">Date et heure</string>
+    <string name="change_target_face">Changer de blason</string>
+    <string name="your_first_training">Votre première entrainement</string>
+    <string name="grouping">Groupement</string>
+    <string name="show_clusters">Groupements</string>
+    <string name="first_training_description">Appuyez sur plus pour commencer un nouveau entrainement.</string>
+    <string name="show_average">Moyenne</string>
+    <string name="show_none">Vide</string>
+    <string name="left_handed">Gaucher</string>
+    <string name="right_handed">Droitier</string>
+    <string name="keyboard">Clavier</string>
+    <string name="backup_drive_desc">Sauvegardez vos données vous permettra de restaurer toutes vos entraînements en cas de perte ou de changement de mobile.</string>
+    <string name="backup_now">Sauvegarder maintenant</string>
+    <string name="last_backup">Dernière sauvegarde : %s</string>
+    <string name="recent_backups">Sauvegardes récentes</string>
+    <string name="dialog_restore_title">Revenir à la version précédente</string>
+    <string name="restore_desc">Restaurer les données va remplacer toutes les données existantes par celles de la sauvegarde.</string>
+    <string name="backup_details">Détails de la sauvegarde</string>
+    <string name="restore">Restaurer</string>
+    <string name="backup_location">Emplacement de la sauvegarde</string>
+    <string name="internal_storage">Mémoire interne</string>
+    <string name="automatic_backup">Sauvegarde automatique</string>
+    <string name="restoring">Restauration de la sauvegarde…</string>
+    <string name="restore_failed">Échec de la restauration</string>
+    <string name="delete_failed">Échec de la suppression</string>
+    <string name="backup_restore_desc">Sauvegarde et restauration des données de l\'application</string>
+    <string name="exporting">Export en cours…</string>
+    <string name="loading_backups_failed">Échec du chargement des sauvegardes !</string>
+    <string name="external_storage">Stockage externe</string>
+    <string name="backup_interval">Intervalle des sauvegarde</string>
+    <string name="daily">Quotidien</string>
+    <string name="weekly">Hebdomadaire</string>
+    <string name="monthly">Mensuel</string>
+    <string name="connection_failed">Échec de la connexion !</string>
+    <string name="shooting_indoor">Tir en salle</string>
+    <string name="bow_rest_vertical_position">Position verticale</string>
+    <string name="bow_rest">Repose flèche</string>
+    <string name="bow_rest_horizontal_position">Position horizontale</string>
+    <string name="bow_cam_settings">Paramètres des poulies</string>
+    <string name="bow_letoff_weight">Puissance résiduelle à l\'allonge</string>
+    <string name="bow_nocking_point">Nockset</string>
+    <string name="bow_string">Corde</string>
+    <string name="bow_scope_magnification">Zoom du scope</string>
+    <string name="bow_rest_stiffness">Rigidité</string>
+    <string name="bow_button">Berger button</string>
+    <string name="more_fields">Autres champs</string>
+    <string name="recently_used">Utilisé récemment</string>
+    <string name="intro_title_track_training_progress">Oublier la feuille de scores !</string>
+    <string name="intro_description_track_training_progress">Avec un suivi précis de vos flèches, vous pouvez tirer plus d\'enseignements de vos données d\'entrainement.</string>
+    <string name="intro_title_everything_in_one_place">Tout ce qu\'il vous faut\nau même endroit</string>
+    <string name="intro_description_everything_in_one_place">Incluant la gestion de l\'arc , des flèches, des réglages de visée, chronomètre, statistiques, et bien plus…</string>
+    <string name="average_arrow_score_per_end">Moyenne de points par flèches par volée</string>
+    <string name="show_end">Affichage sur la volée</string>
+    <string name="show_round">Affichage sur la série</string>
+    <string name="show_training">Afficher l\'entraînement</string>
+    <string name="summary">Résumé</string>
+    <string name="end">Volée</string>
+    <string name="average_of">La moyenne de</string>
+    <string name="displayed_shots">Tirs affichés</string>
+    <string name="invalid_decimal_number">Nombre décimal non valide</string>
+    <string name="not_within_expected_range_mm">Pas dans l\'intervalle prévu de 1 à 20 mm</string>
+    <string name="not_within_expected_range_inch">Pas dans l\'intervalle attendu de 0 à 1 pouce</string>
+    <string name="next_round">Série suivante</string>
+    <string name="previous_round">Série précédente</string>
+    <string name="overview">Résumé</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Afficher le score</string>
+    <string name="show_total_score">Voir le score total</string>
+    <string name="show_percentage">Voir le pourcentage</string>
+    <string name="show_arrow_average">Afficher la moyenne par flèche</string>
+    <string name="image_deleted">Image supprimée</string>
+    <string name="delete_image">Supprimer l\'image ?</string>
+    <string name="keyboard_type">Type de clavier</string>
+    <string name="keyboard_enabled">Clavier activé</string>
+    <string name="sort_shots">Trier les flèches</string>
+    <string name="sort_shots_for_spots">Trier les flèches pour les blasons à spots</string>
+    <string name="target_captain">Marqueur</string>
+    <string name="language">Langue</string>
+    <string name="warning_backup_experimental">Attention : Cette fonctionnalité est encore expérimentale ! Veuillez vérifier régulièrement si la sauvegarde a été vraiment réussie !</string>
+    <string name="drawer_open">Ouvrir le panneau latéral</string>
+    <string name="drawer_close">Fermer le panneau latéral</string>
+    <string name="help">Aide</string>
+    <string name="home">Accueil</string>
+    <string name="click_to_enter_profile">Cliquer pour ajouter vos informations personnelles</string>
+    <string name="no_trainings">Vous n\'avez pas encore d\'entraînement!</string>
+    <string name="no_bows">Pas d\'arc</string>
+    <string name="no_arrows">Pas de flèche</string>
+    <string name="version_info">Informations de version</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Nombre de flèches maximal</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diamètres</string>
+    <string name="bows">Arcs</string>
+    <string name="reset">Réinitialiser</string>
+    <string name="end_x_of_y">Volée %1$d/%2$d</string>
+    <string name="round_x_of_y">Série %1$d/%2$d</string>
+    <string name="settings_summary_timer">Régler le comportement de la minuterie</string>
+    <string name="settings_summary_scoreboard">Changer l’apparence du tableau de scores</string>
+    <string name="settings_summary_input">Personnaliser l’écran de saisie</string>
+    <string name="settings_summary_overview">Personnaliser les informations affichées pour les entraienements, les séries et les volées</string>
+    <string name="settings_summary_profile">Entrer vosinformations personnelles</string>
+    <string name="licence_number">Numéro de licence</string>
+    <string name="file_type">Type de fichier</string>
+    <string name="clear">Effacer</string>
+    <string name="tap_to_sign">Appuyez pour vous connecter</string>
+    <string name="pdf_file">Fichier PDF</string>
+    <string name="image_file">Fichier image</string>
+    <string name="settings_summary_statistics">Régler l’écran des statistiques</string>
+    <string name="settings_statistics_spots_to_single_target">Agréger tous les impacts sur une seule cible</string>
+    <string name="keep_above_lockscreen">Au-dessus de l\'écran de verrouillage</string>
+    <string name="scoreboard_title_all_rounds">Toutes les séries</string>
+    <string name="permission_required">Autorisation nécessaire</string>
+    <string name="backup_permission_explanation"><![CDATA[Pour être capable de sauver vos données, l\'application a besoin de l\'autorisation d\'accèder au stockage interne de votre téléphone. Pour utiliser la fonctionalité de backup, allez dans les paramètres systême > Apps > MyTargets > Autorisations et activez le paramètre \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 921006a34..c2d44aaf3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Beállítások</string>
-  <string name="settings">Beállitások</string>
-  <string name="prev">Előző</string>
-  <string name="next">Következõ</string>
-  <string name="save">Mentés</string>
-  <string name="custom">Egyéni</string>
-  <string name="training">Lövészet</string>
-  <string name="bow">Íj</string>
-  <string name="arrow">Nyílvesszõ</string>
-  <string name="round">Forduló</string>
-  <string name="points">Pontok</string>
-  <string name="passe">Sorozat</string>
-  <!-- Overview -->
-  <string name="new_training">Új lövészet</string>
-  <string name="new_bow">Új íj</string>
-  <string name="new_arrow">Új nyílvesszõ</string>
-  <string name="new_round">Új forduló</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d lövészet kiválasztva</item>
-    <item quantity="other">%d edzések kiválasztása</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d íj kiválasztva</item>
-    <item quantity="other">%d íjak kiválasztása</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d. vesszõ kiválasztva</item>
-    <item quantity="other">%d vesszõ kiválasztva</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d. sorozat kiválasztva</item>
-    <item quantity="other">%d sorozatok kiválasztása</item>
-  </plurals>
-  <string name="edit">Szerkesztés</string>
-  <string name="delete">Törlés</string>
-  <string name="statistic">Statisztika</string>
-  <!-- Share -->
-  <string name="share">Megosztás</string>
-  <string name="dispersion_pattern">Találatok eloszlása</string>
-  <string name="sharing_failed">Megosztás nem sikerült!</string>
-  <!-- Export -->
-  <string name="send_exported">Mentett adatok küldése</string>
-  <string name="exporting_failed">Küldés sikertelen!</string>
-  <!-- New bow -->
-  <string name="add_bow">Íj hozzáadása</string>
-  <string name="name">Név</string>
-  <string name="bow_type">Íj típusa</string>
-  <string name="properties">Tulajdonságok</string>
-  <string name="brand">Márka</string>
-  <string name="size">Méret</string>
-  <string name="description">Leírás</string>
-  <string name="height">Ajzásmagasság</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Irányzék beállításai</string>
-  <string name="add">Hozzáad</string>
-  <string name="take_picture">Fotó készítése</string>
-  <string name="pick_from_gallery">válassz képet a galériából</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Nyílvesszõ hozzáadása</string>
-  <string name="length">Hossz</string>
-  <string name="spine">Vessző elhajlási értéke</string>
-  <string name="weight">vessző súlya</string>
-  <string name="vanes">Tollak</string>
-  <string name="nock">Vessző ajak</string>
-  <string name="material">Anyag</string>
-  <!-- New round -->
-  <string name="title">Megnevezés</string>
-  <string name="outdoor">Szabadtéri</string>
-  <string name="indoor">Terem</string>
-  <string name="distance">Távolság</string>
-  <string name="format">Formátum</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d. sorozat</item>
-    <item quantity="other">%d sorozatok</item>
-  </plurals>
-  <string name="with">a</string>
-  <plurals name="arrow">
-    <item quantity="one">%d. vesszõ</item>
-    <item quantity="other">%d nyílvesszõk</item>
-  </plurals>
-  <string name="target_face">A lőlap tipusa</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Beírólap</string>
-  <string name="arrows">Nyílvesszők</string>
-  <string name="sum">Pontszám</string>
-  <string name="carry">Forduló összesítő</string>
-  <string name="action_print">Nyomtatás</string>
-  <string name="average">Átlag</string>
-  <!-- Input mode -->
-  <string name="comment">Megjegyzés</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Fájl kiválasztása</string>
-  <string name="dir_not_created">Mappa nem hozható létre!</string>
-  <string name="import_failed">Importálás sikertelen!</string>
-  <string name="file_not_found">A fájl nem található!</string>
-  <string name="failed_reading_file">A fájl olvasása sikertelen!</string>
-  <!-- Donate -->
-  <string name="donate_2">Adomány egy burgerre</string>
-  <string name="donate_5">Adomány egy kebabra</string>
-  <string name="donate_10">Adomány egy nagy pizzára</string>
-  <string name="donate_20">Adomány egy kis üzemanyagra</string>
-  <string name="donation_thank">Köszönöm a támogatást!</string>
-  <string name="donate_text" formatted="false">Az összegek tartalmazzák az ÁFA-t és a Google 30%-os díját. Esetleg, szíves adományként a PayPal-on a dreier.florian@gmail.com számlára.</string>
-  <!-- Timer -->
-  <string name="timer">Stopper</string>
-  <string name="touch_to_start">Érintésre índít</string>
-  <string name="preparation">Készülj</string>
-  <string name="shooting">Lövés</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Lövési idõ</string>
-  <string name="timer_waiting_time">Felkészülési idõ</string>
-  <string name="timer_warning_time">Figyelmeztetés</string>
-  <string name="timer_sound">Hang</string>
-  <string name="timer_vibrate">Rezgés</string>
-  <!-- Settings -->
-  <string name="backup_action">Mentés</string>
-  <string name="import_action">Importálás</string>
-  <string name="exports_as_csv">Exportálás CSV-ként</string>
-  <string name="licences">Nyílt forráskódú licencek</string>
-  <string name="licences_summary">Jogi engedélyek</string>
-  <string name="version">%s Verzió</string>
-  <plurals name="second">
-    <item quantity="one">%d másodperc</item>
-    <item quantity="other">%d másodpercek</item>
-  </plurals>
-  <string name="info">Információ</string>
-  <string name="data">Adat</string>
-  <string name="weather">Időjárás</string>
-  <string name="environment">Környezet</string>
-  <string name="wind_speed">Szélsebesség</string>
-  <string name="wind_direction">Szél irány</string>
-  <string name="sight_setting_removed">Irányzék-beállítás törölve!</string>
-  <string name="metric">Metrikus</string>
-  <string name="imperial">Angolszász</string>
-  <string name="undo">Visszavonás</string>
-  <string name="standard_rounds">A szabványos fordulók</string>
-  <string name="expand_collapse">Kibontás/összecsukás</string>
-  <string name="new_round_template">Új Sablon</string>
-  <string name="arrow_numbers">Kilőtt vesszők sorszámozása</string>
-  <string name="round_removed">Forduló törölve!</string>
-  <string name="custom_round">Egyéni forduló</string>
-  <string name="filter">Szűrő</string>
-  <string name="club">Egyesület</string>
-  <string name="target">Lőlap</string>
-  <string name="standard_round">Szabványos forduló</string>
-  <string name="use_as_template">Használja sablonként?</string>
-  <string name="create_copy">Ez egy szabványos forduló! \nLétrehozol egy másolatot a szerkesztéshez?</string>
-  <string name="practice">Gyakorlás</string>
-  <string name="edit_training">Lövészet szerkesztése</string>
-  <string name="edit_standard_round">Szabványos forduló szerkesztése</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d. vessző törölve</item>
-    <item quantity="other">%d vesszők törölve</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d íj törölve</item>
-    <item quantity="other">%d íjak törölve</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d lövészet törölve</item>
-    <item quantity="other">%d edzések törölve</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d. sorozat törölve</item>
-    <item quantity="other">%d sorozatok törölve</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">%d. forduló</item>
-    <item quantity="other">%d fordulók</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d. forduló kiválasztása</item>
-    <item quantity="other">%d fordulók kiválasztása</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d. forduló törölve</item>
-    <item quantity="other">%d fordulók törölve</item>
-  </plurals>
-  <string name="date">Dátum</string>
-  <string name="edit_round">Forduló szerkesztése</string>
-  <string name="draw_weight">Húzóerő</string>
-  <string name="sight">Irányzék</string>
-  <string name="limbs">Karok</string>
-  <string name="my_bow">Az íjam</string>
-  <string name="my_arrow">Vesszőim</string>
-  <string name="tip_weight">a hegy súlya</string>
-  <string name="arrow_ranking">Vesszők találati értéke</string>
-  <string name="arrow_x_of_set_of_arrows">%2$s. nyíl a %1$s-ból</string>
-  <string name="display">Megjelenítés</string>
-  <string name="print">Nyomtatás</string>
-  <string name="table">Táblázat</string>
-  <string name="comments">Megjegyzések</string>
-  <string name="show_points_colored">Találatok színes megjelenítése</string>
-  <string name="stabilizer">Stabilizátor</string>
-  <string name="clicker">Kattintó</string>
-  <string name="arrow_number_x">%s számú vessző</string>
-  <string name="training_with_standard_round">A Standard fordulós gyakorlás</string>
-  <string name="free_training">Szabad lövészet</string>
-  <string name="competition">Verseny</string>
-  <string name="about">Leírás</string>
-  <string name="general">Általános </string>
-  <string name="contribute">Közzététel</string>
-  <string name="connect">Kapcsolódás</string>
-  <string name="special_thanks_to">Külön köszönet:</string>
-  <string name="all_translators">Akik segített fordításban!</string>
-  <string name="all_beta_testers">Akik csatlakoztak a béta tesztelőkhöz, és ezzel hozzájárultak a fejlesztéshez.</string>
-  <string name="test_beta">Frissítések keresése a béta verziók között is</string>
-  <string name="join_on_google_plus">Csatlakozzon hozzánk Google+-on</string>
-  <string name="share_with_friends">Ossza meg barátaival!</string>
-  <string name="donate">Támogatás</string>
-  <string name="donate_via_paypal">Adományozhat PayPal-on</string>
-  <string name="translate_crowdin">Te is segíthetsz a fordításban – Crowdin</string>
-  <string name="network_linkedin">Hálózat a LinkedIn</string>
-  <string name="search">Keresés</string>
-  <string name="us">amerikai</string>
-  <string name="show_shots_training">Teljes lövészet</string>
-  <string name="show_shots_round">Jelenlegi forduló</string>
-  <string name="show_shots_end">Jelenlegi sorozat</string>
-  <string name="profile">Profilom</string>
-  <string name="birthday">Születésnap</string>
-  <string name="first_name">Keresztnév</string>
-  <string name="last_name">Családnév</string>
-  <string name="age">Életkor</string>
-  <string name="show_signature">Aláírás</string>
-  <string name="archer">Íjász</string>
-  <string name="hits">Találatok</string>
-  <string name="misses">Mellé</string>
-  <string name="new_end">Új sorozat</string>
-  <string name="distribution">Szóráskép</string>
-  <string name="count">Számláló</string>
-  <string name="diameter">Átmérő</string>
-  <string name="input">Találatok rögzítése/megjelenítése</string>
-  <string name="target_zoom">Lőlap nagyítása</string>
-  <string name="action_pdf">Exportálás PDF-be</string>
-  <string name="arrow_diameter_scale">A találat átmérője</string>
-  <string name="timestamp">Időbélyeg</string>
-  <string name="change_target_face">Lőlap váltása</string>
-  <string name="your_first_training">Az első lövészet</string>
-  <string name="grouping">Csoportosítás</string>
-  <string name="show_clusters">találatok csoportosítása</string>
-  <string name="first_training_description">Érintse meg a + az új lövészet megkezdéséhez</string>
-  <string name="show_average">Átlag</string>
-  <string name="show_none">Semmi</string>
-  <string name="left_handed">Balkezes</string>
-  <string name="right_handed">Jobbkezes</string>
-  <string name="keyboard">A lőlap pontértékei</string>
-  <string name="backup_drive_desc">Az adatok biztonsági mentése lehetővé teszi, hogy később visszaállítsa az összes edzés/lövést és beállításokat, abban az esetben, ha elveszett, vagy lecserélte az eszközt.</string>
-  <string name="backup_now">Mentés most</string>
-  <string name="last_backup">Utolsó mentés: %s</string>
-  <string name="recent_backups">Legutóbbi biztonsági mentések</string>
-  <string name="dialog_restore_title">Visszaállítás erre a verzióra</string>
-  <string name="restore_desc">Az adatok visszaállítása felülírja a meglévő adatokat.</string>
-  <string name="backup_details">A biztonsági mentés részletei</string>
-  <string name="restore">Visszaállítás</string>
-  <string name="backup_location">Biztonsági mentés helye</string>
-  <string name="internal_storage">Belső tároló</string>
-  <string name="automatic_backup">Automatikus biztonsági mentés</string>
-  <string name="restoring">Betöltöm a mentett állapotot…</string>
-  <string name="restore_failed">A visszaállítás sikertelen!</string>
-  <string name="delete_failed">Törlés sikertelen</string>
-  <string name="backup_restore_desc">Alkalmazás adatainak mentése és visszaállítása</string>
-  <string name="exporting">Exportálás…</string>
-  <string name="loading_backups_failed">Biztonsági mentések betöltése sikertelen!</string>
-  <string name="external_storage">Külső tárhely</string>
-  <string name="backup_interval">Biztonsági mentési időköz</string>
-  <string name="daily">Napi</string>
-  <string name="weekly">Heti</string>
-  <string name="monthly">Havonta</string>
-  <string name="connection_failed">Sikertelen kapcsolódás!</string>
-  <string name="shooting_indoor">Beltéri lövés</string>
-  <string name="bow_rest_vertical_position">Függőleges helyzet</string>
-  <string name="bow_rest">Kifutó</string>
-  <string name="bow_rest_horizontal_position">Vízszintes helyzet</string>
-  <string name="bow_cam_settings">Kamera beállítások</string>
-  <string name="bow_letoff_weight">A kiengedés ereje</string>
-  <string name="bow_nocking_point">Göb magasság</string>
-  <string name="bow_string">Ideg</string>
-  <string name="bow_scope_magnification">A lencse nagyító értéke</string>
-  <string name="bow_rest_stiffness">Merevség</string>
-  <string name="bow_button">Oldaltámaszték/berger</string>
-  <string name="more_fields">További mezők</string>
-  <string name="recently_used">Gyakran használt</string>
-  <string name="intro_title_track_training_progress">Felejtsd el a papírt beírólapokat!</string>
-  <string name="intro_description_track_training_progress">A találatok pontos bejelölése,\na lövészet adatainak részletesebb áttekintése.</string>
-  <string name="intro_title_everything_in_one_place">Minden szükséges\n egy helyen</string>
-  <string name="intro_description_everything_in_one_place">Az íj, vessző, irányzék beállítások,\nidőzítő, statisztikák\nés még több…</string>
-  <string name="average_arrow_score_per_end">A vesszők átlagos pontszáma sorozatonként</string>
-  <string name="show_end">Mutasd a sorozatot</string>
-  <string name="show_round">Mutasd a fordulót</string>
-  <string name="show_training">Mutasd a teljes lövést</string>
-  <string name="summary">Összegzés</string>
-  <string name="end">Sorozat</string>
-  <string name="average_of">Átlag</string>
-  <string name="displayed_shots">Megjelenített találatok</string>
-  <string name="invalid_decimal_number">Érvénytelen tizedes</string>
-  <string name="not_within_expected_range_mm">Nem a várt tartományban 1-20 mm</string>
-  <string name="not_within_expected_range_inch">Nem a várt tartományban 0-1 hüvelyk</string>
-  <string name="next_round">Következő forduló</string>
-  <string name="previous_round">Előző forduló</string>
-  <string name="overview">Áttekintő</string>
-  <string name="score">Pontszám</string>
-  <string name="show_reached_score">Mutasd az elért pontszámokat</string>
-  <string name="show_total_score">A maximális pontszám</string>
-  <string name="show_percentage">Százalékos megjelenítés</string>
-  <string name="show_arrow_average">Mutasd a vesszők pontátlagát</string>
-  <string name="image_deleted">A kép törölve</string>
-  <string name="delete_image">Törlöd a képet?</string>
-  <string name="keyboard_type">Billentyűzet típusa</string>
-  <string name="keyboard_enabled">Engedélyezett billentyűzet</string>
-  <string name="sort_shots">Lövések sorbarendezése</string>
-  <string name="sort_shots_for_spots">Lövések rendezése a szemafor-lőlap szerint</string>
-  <string name="target_captain">Lőlap vezető</string>
-  <string name="language">Nyelv</string>
-  <string name="warning_backup_experimental">Figyelmeztetés: Ez a szolgáltatás még kísérleti fázisban! Kérjük, ellenőrizze a rendszeres időközönként ha igazán sikeres volt, a biztonsági másolat!</string>
-  <string name="drawer_open">Rögzítő megnyitása</string>
-  <string name="drawer_close">Rögzítő bezárása</string>
-  <string name="help">Súgó</string>
-  <string name="home">Nyitólap</string>
-  <string name="click_to_enter_profile">Ide kattintva adja meg a profiladatokat</string>
-  <string name="no_trainings">Ön még nem rögzített lövéseket!</string>
-  <string name="no_bows">Hiányzik az íj</string>
-  <string name="no_arrows">Nincsenek vesszők</string>
-  <string name="version_info">Verzió információ</string>
-  <string name="version_prefix">Verzió</string>
-  <string name="max_arrow_number">Vesszők maximális száma</string>
-  <string name="distances">Távolságok</string>
-  <string name="diameters">Átmérők</string>
-  <string name="bows">Íjak</string>
-  <string name="reset">Visszaállitás</string>
-  <string name="end_x_of_y">Sorozat %1$d/%2$d</string>
-  <string name="round_x_of_y">Forduló %1$d/%2$d</string>
-  <string name="settings_summary_timer">Az időzítő viselkedésének beállítása</string>
-  <string name="settings_summary_scoreboard">Az eredménytábla megjelentítése</string>
-  <string name="settings_summary_input">Bemeneti képernyő testreszabása</string>
-  <string name="settings_summary_overview">Edzések, körök, és sorozatok megjelenítésének beállításai</string>
-  <string name="settings_summary_profile">Személyes adatok kezelése</string>
-  <string name="licence_number">Engedély száma</string>
-  <string name="file_type">Fájl típusa</string>
-  <string name="clear">Kiürít</string>
-  <string name="tap_to_sign">Megnyitásához érintse meg</string>
-  <string name="pdf_file">PDF-fájl</string>
-  <string name="image_file">Képfájl</string>
-  <string name="settings_summary_statistics">Állítsa be a statisztika képernyőt</string>
-  <string name="settings_statistics_spots_to_single_target">Összesített pontok egyetlen lőlapon</string>
-  <string name="keep_above_lockscreen">Tartsa a zárolt képernyőn</string>
-  <string name="scoreboard_title_all_rounds">Forduló összesítő</string>
-  <string name="permission_required">Engedély szükséges</string>
-  <string name="backup_permission_explanation"><![CDATA[Ahhoz, hogy egy biztonsági másolatot készíts az adatokról, az alkalmazásnak engedélyre van szüksége az eszköz belső tárterületéhez. A további használathoz engedélyezze a hozzáférést: Beállítások &gt; Alkalmazások &gt; MyTargets &gt; Engedélyek a \'Tárolóeszköz\ ".]]></string>
+    <!-- General -->
+    <string name="preferences">Beállítások</string>
+    <string name="settings">Beállitások</string>
+    <string name="prev">Előző</string>
+    <string name="next">Következõ</string>
+    <string name="save">Mentés</string>
+    <string name="custom">Egyéni</string>
+    <string name="training">Lövészet</string>
+    <string name="bow">Íj</string>
+    <string name="arrow">Nyílvesszõ</string>
+    <string name="round">Forduló</string>
+    <string name="points">Pontok</string>
+    <string name="passe">Sorozat</string>
+    <!-- Overview -->
+    <string name="new_training">Új lövészet</string>
+    <string name="new_bow">Új íj</string>
+    <string name="new_arrow">Új nyílvesszõ</string>
+    <string name="new_round">Új forduló</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d lövészet kiválasztva</item>
+        <item quantity="other">%d edzések kiválasztása</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d íj kiválasztva</item>
+        <item quantity="other">%d íjak kiválasztása</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d. vesszõ kiválasztva</item>
+        <item quantity="other">%d vesszõ kiválasztva</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d. sorozat kiválasztva</item>
+        <item quantity="other">%d sorozatok kiválasztása</item>
+    </plurals>
+    <string name="edit">Szerkesztés</string>
+    <string name="delete">Törlés</string>
+    <string name="statistic">Statisztika</string>
+    <!-- Share -->
+    <string name="share">Megosztás</string>
+    <string name="dispersion_pattern">Lőlap képe</string>
+    <string name="sharing_failed">Megosztás nem sikerült!</string>
+    <!-- Export -->
+    <string name="send_exported">Mentett adatok küldése</string>
+    <string name="exporting_failed">Küldés sikertelen!</string>
+    <!-- New bow -->
+    <string name="add_bow">Íj hozzáadása</string>
+    <string name="name">Név</string>
+    <string name="bow_type">Íj típusa</string>
+    <string name="properties">Tulajdonságok</string>
+    <string name="brand">Márka</string>
+    <string name="size">Méret</string>
+    <string name="description">Leírás</string>
+    <string name="height">Ajzásmagasság</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Irányzék beállításai</string>
+    <string name="add">Hozzáad</string>
+    <string name="take_picture">Fotó készítése</string>
+    <string name="pick_from_gallery">válassz képet a galériából</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Nyílvesszõ hozzáadása</string>
+    <string name="length">Hossz</string>
+    <string name="spine">Vessző elhajlási értéke</string>
+    <string name="weight">vessző súlya</string>
+    <string name="vanes">Tollak</string>
+    <string name="nock">Vessző ajak</string>
+    <string name="material">Anyag</string>
+    <!-- New round -->
+    <string name="title">Megnevezés</string>
+    <string name="outdoor">Szabadtéri</string>
+    <string name="indoor">Terem</string>
+    <string name="distance">Távolság</string>
+    <string name="format">Formátum</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d. sorozat</item>
+        <item quantity="other">%d sorozatok</item>
+    </plurals>
+    <string name="with">a</string>
+    <plurals name="arrow">
+        <item quantity="one">%d. vesszõ</item>
+        <item quantity="other">%d nyílvesszõk</item>
+    </plurals>
+    <string name="target_face">A lőlap tipusa</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Beírólap</string>
+    <string name="arrows">Nyílvesszők</string>
+    <string name="sum">Pontszám</string>
+    <string name="carry">Forduló összesítő</string>
+    <string name="action_print">Nyomtatás</string>
+    <string name="average">Átlag</string>
+    <!-- Input mode -->
+    <string name="comment">Megjegyzés</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Fájl kiválasztása</string>
+    <string name="dir_not_created">Mappa nem hozható létre!</string>
+    <string name="import_failed">Importálás sikertelen!</string>
+    <string name="file_not_found">A fájl nem található!</string>
+    <string name="failed_reading_file">A fájl olvasása sikertelen!</string>
+    <!-- Donate -->
+    <string name="donate_2">Adomány egy burgerre</string>
+    <string name="donate_5">Adomány egy kebabra</string>
+    <string name="donate_10">Adomány egy nagy pizzára</string>
+    <string name="donate_20">Adomány egy kis üzemanyagra</string>
+    <string name="donation_thank">Köszönöm a támogatást!</string>
+    <string name="donate_text" formatted="false">Az összegek tartalmazzák az ÁFA-t és a Google 30%-os díját. Esetleg, szíves adományként a PayPal-on a dreier.florian@gmail.com számlára.</string>
+    <!-- Timer -->
+    <string name="timer">Stopper</string>
+    <string name="touch_to_start">Érintésre índít</string>
+    <string name="preparation">Készülj</string>
+    <string name="shooting">Lövés</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Lövési idõ</string>
+    <string name="timer_waiting_time">Felkészülési idõ</string>
+    <string name="timer_warning_time">Figyelmeztetés</string>
+    <string name="timer_sound">Hang</string>
+    <string name="timer_vibrate">Rezgés</string>
+    <!-- Settings -->
+    <string name="backup_action">Mentés</string>
+    <string name="import_action">Importálás</string>
+    <string name="exports_as_csv">Exportálás CSV-ként</string>
+    <string name="licences">Nyílt forráskódú licencek</string>
+    <string name="licences_summary">Jogi engedélyek</string>
+    <string name="version">%s Verzió</string>
+    <plurals name="second">
+        <item quantity="one">%d másodperc</item>
+        <item quantity="other">%d másodpercek</item>
+    </plurals>
+    <string name="info">Információ</string>
+    <string name="data">Adat</string>
+    <string name="weather">Időjárás</string>
+    <string name="environment">Környezet</string>
+    <string name="wind_speed">Szélsebesség</string>
+    <string name="wind_direction">Szél irány</string>
+    <string name="sight_setting_removed">Irányzék-beállítás törölve!</string>
+    <string name="metric">Metrikus</string>
+    <string name="imperial">Angolszász</string>
+    <string name="undo">Visszavonás</string>
+    <string name="standard_rounds">A szabványos fordulók</string>
+    <string name="expand_collapse">Kibontás/összecsukás</string>
+    <string name="new_round_template">Új Sablon</string>
+    <string name="arrow_numbers">Kilőtt vesszők sorszámozása</string>
+    <string name="round_removed">Forduló törölve!</string>
+    <string name="custom_round">Egyéni forduló</string>
+    <string name="filter">Szűrő</string>
+    <string name="club">Egyesület</string>
+    <string name="target">Lőlap</string>
+    <string name="standard_round">Szabványos forduló</string>
+    <string name="use_as_template">Használja sablonként?</string>
+    <string name="create_copy">Ez egy szabványos forduló! \nLétrehozol egy másolatot a szerkesztéshez?</string>
+    <string name="practice">Gyakorlás</string>
+    <string name="edit_training">Lövészet szerkesztése</string>
+    <string name="edit_standard_round">Szabványos forduló szerkesztése</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d. vessző törölve</item>
+        <item quantity="other">%d vesszők törölve</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d íj törölve</item>
+        <item quantity="other">%d íjak törölve</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d lövészet törölve</item>
+        <item quantity="other">%d edzések törölve</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d. sorozat törölve</item>
+        <item quantity="other">%d sorozatok törölve</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">%d. forduló</item>
+        <item quantity="other">%d fordulók</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d. forduló kiválasztása</item>
+        <item quantity="other">%d fordulók kiválasztása</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d. forduló törölve</item>
+        <item quantity="other">%d fordulók törölve</item>
+    </plurals>
+    <string name="date">Dátum</string>
+    <string name="edit_round">Forduló szerkesztése</string>
+    <string name="draw_weight">Húzóerő</string>
+    <string name="sight">Irányzék</string>
+    <string name="limbs">Karok</string>
+    <string name="my_bow">Az íjam</string>
+    <string name="my_arrow">Vesszőim</string>
+    <string name="tip_weight">a hegy súlya</string>
+    <string name="arrow_ranking">Vesszők átlagolt pontértékei</string>
+    <string name="arrow_x_of_set_of_arrows">%2$s. nyíl a %1$s-ból</string>
+    <string name="display">Megjelenítés</string>
+    <string name="print">Nyomtatás</string>
+    <string name="table">Táblázat</string>
+    <string name="comments">Megjegyzések</string>
+    <string name="show_points_colored">Találatok színes megjelenítése</string>
+    <string name="stabilizer">Stabilizátor</string>
+    <string name="clicker">Kattintó</string>
+    <string name="arrow_number_x">%s számú vessző</string>
+    <string name="training_with_standard_round">A Standard fordulós gyakorlás</string>
+    <string name="free_training">Szabad lövészet</string>
+    <string name="competition">Verseny</string>
+    <string name="about">Leírás</string>
+    <string name="general">Általános </string>
+    <string name="contribute">Közzététel</string>
+    <string name="connect">Kapcsolódás</string>
+    <string name="special_thanks_to">Külön köszönet:</string>
+    <string name="all_translators">Akik segített fordításban!</string>
+    <string name="all_beta_testers">Akik csatlakoztak a béta tesztelőkhöz, és ezzel hozzájárultak a fejlesztéshez.</string>
+    <string name="test_beta">Frissítések keresése a béta verziók között is</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Ossza meg barátaival!</string>
+    <string name="donate">Támogatás</string>
+    <string name="donate_via_paypal">Adományozhat PayPal-on</string>
+    <string name="translate_crowdin">Te is segíthetsz a fordításban – Crowdin</string>
+    <string name="network_linkedin">Hálózat a LinkedIn</string>
+    <string name="search">Keresés</string>
+    <string name="us">amerikai</string>
+    <string name="show_shots_training">Teljes lövészet</string>
+    <string name="show_shots_round">Jelenlegi forduló</string>
+    <string name="show_shots_end">Jelenlegi sorozat</string>
+    <string name="profile">Profilom</string>
+    <string name="birthday">Születésnap</string>
+    <string name="first_name">Keresztnév</string>
+    <string name="last_name">Családnév</string>
+    <string name="age">Életkor</string>
+    <string name="show_signature">Aláírás</string>
+    <string name="archer">Íjász</string>
+    <string name="hits">Találatok</string>
+    <string name="misses">Mellé</string>
+    <string name="new_end">Új sorozat</string>
+    <string name="distribution">Találatok aránydiagramja</string>
+    <string name="count">Számláló</string>
+    <string name="diameter">Átmérő</string>
+    <string name="input">Találatok rögzítése/megjelenítése</string>
+    <string name="target_zoom">Lőlap nagyítása</string>
+    <string name="action_pdf">Exportálás PDF-be</string>
+    <string name="arrow_diameter_scale">A találat átmérője</string>
+    <string name="timestamp">Időbélyeg</string>
+    <string name="change_target_face">Lőlap váltása</string>
+    <string name="your_first_training">Az első lövészet</string>
+    <string name="grouping">Csoportosítás</string>
+    <string name="show_clusters">találatok csoportosítása</string>
+    <string name="first_training_description">Érintse meg a + az új lövészet megkezdéséhez</string>
+    <string name="show_average">Átlag</string>
+    <string name="show_none">Semmi</string>
+    <string name="left_handed">Balkezes</string>
+    <string name="right_handed">Jobbkezes</string>
+    <string name="keyboard">A lőlap pontértékei</string>
+    <string name="backup_drive_desc">Az adatok biztonsági mentése lehetővé teszi, hogy később visszaállítsa az összes edzés/lövést és beállításokat, abban az esetben, ha elveszett, vagy lecserélte az eszközt.</string>
+    <string name="backup_now">Mentés most</string>
+    <string name="last_backup">Utolsó mentés: %s</string>
+    <string name="recent_backups">Legutóbbi biztonsági mentések</string>
+    <string name="dialog_restore_title">Visszaállítás erre a verzióra</string>
+    <string name="restore_desc">Az adatok visszaállítása felülírja a meglévő adatokat.</string>
+    <string name="backup_details">A biztonsági mentés részletei</string>
+    <string name="restore">Visszaállítás</string>
+    <string name="backup_location">Biztonsági mentés helye</string>
+    <string name="internal_storage">Belső tároló</string>
+    <string name="automatic_backup">Automatikus biztonsági mentés</string>
+    <string name="restoring">Betöltöm a mentett állapotot…</string>
+    <string name="restore_failed">A visszaállítás sikertelen!</string>
+    <string name="delete_failed">Törlés sikertelen</string>
+    <string name="backup_restore_desc">Alkalmazás adatainak mentése és visszaállítása</string>
+    <string name="exporting">Exportálás…</string>
+    <string name="loading_backups_failed">Biztonsági mentések betöltése sikertelen!</string>
+    <string name="external_storage">Külső tárhely</string>
+    <string name="backup_interval">Biztonsági mentési időköz</string>
+    <string name="daily">Napi</string>
+    <string name="weekly">Heti</string>
+    <string name="monthly">Havonta</string>
+    <string name="connection_failed">Sikertelen kapcsolódás!</string>
+    <string name="shooting_indoor">Beltéri lövés</string>
+    <string name="bow_rest_vertical_position">Függőleges helyzet</string>
+    <string name="bow_rest">Kifutó</string>
+    <string name="bow_rest_horizontal_position">Vízszintes helyzet</string>
+    <string name="bow_cam_settings">Kamera beállítások</string>
+    <string name="bow_letoff_weight">A kiengedés ereje</string>
+    <string name="bow_nocking_point">Göb magasság</string>
+    <string name="bow_string">Ideg</string>
+    <string name="bow_scope_magnification">A lencse nagyító értéke</string>
+    <string name="bow_rest_stiffness">Merevség</string>
+    <string name="bow_button">Oldaltámaszték/berger</string>
+    <string name="more_fields">További mezők</string>
+    <string name="recently_used">Gyakran használt</string>
+    <string name="intro_title_track_training_progress">Felejtsd el a papírt beírólapokat!</string>
+    <string name="intro_description_track_training_progress">A találatok pontos bejelölése,\na lövészet adatainak részletesebb áttekintése.</string>
+    <string name="intro_title_everything_in_one_place">Minden szükséges\n egy helyen</string>
+    <string name="intro_description_everything_in_one_place">Az íj, vessző, irányzék beállítások,\nidőzítő, statisztikák\nés még több…</string>
+    <string name="average_arrow_score_per_end">A vesszők átlagos pontszáma sorozatonként</string>
+    <string name="show_end">Mutasd a sorozatot</string>
+    <string name="show_round">Mutasd a fordulót</string>
+    <string name="show_training">Mutasd a teljes lövést</string>
+    <string name="summary">Összegzés</string>
+    <string name="end">Sorozat</string>
+    <string name="average_of">Átlag</string>
+    <string name="displayed_shots">Megjelenített találatok</string>
+    <string name="invalid_decimal_number">Érvénytelen tizedes</string>
+    <string name="not_within_expected_range_mm">Nem a várt tartományban 1-20 mm</string>
+    <string name="not_within_expected_range_inch">Nem a várt tartományban 0-1 hüvelyk</string>
+    <string name="next_round">Következő forduló</string>
+    <string name="previous_round">Előző forduló</string>
+    <string name="overview">Áttekintő</string>
+    <string name="score">Pontszám</string>
+    <string name="show_reached_score">Mutasd az elért pontszámokat</string>
+    <string name="show_total_score">A maximális pontszám</string>
+    <string name="show_percentage">Százalékos megjelenítés</string>
+    <string name="show_arrow_average">Mutasd a vesszők pontátlagát</string>
+    <string name="image_deleted">A kép törölve</string>
+    <string name="delete_image">Törlöd a képet?</string>
+    <string name="keyboard_type">Billentyűzet típusa</string>
+    <string name="keyboard_enabled">Engedélyezett billentyűzet</string>
+    <string name="sort_shots">Lövések sorbarendezése</string>
+    <string name="sort_shots_for_spots">Lövések rendezése a szemafor-lőlap szerint</string>
+    <string name="target_captain">Lőlap vezető</string>
+    <string name="language">Nyelv</string>
+    <string name="warning_backup_experimental">Figyelmeztetés: Ez a szolgáltatás még kísérleti fázisban! Kérjük, ellenőrizze a rendszeres időközönként ha igazán sikeres volt, a biztonsági másolat!</string>
+    <string name="drawer_open">Rögzítő megnyitása</string>
+    <string name="drawer_close">Rögzítő bezárása</string>
+    <string name="help">Súgó</string>
+    <string name="home">Nyitólap</string>
+    <string name="click_to_enter_profile">Ide kattintva adja meg a profiladatokat</string>
+    <string name="no_trainings">Ön még nem rögzített lövéseket!</string>
+    <string name="no_bows">Hiányzik az íj</string>
+    <string name="no_arrows">Nincsenek vesszők</string>
+    <string name="version_info">Verzió információ</string>
+    <string name="version_prefix">Verzió</string>
+    <string name="max_arrow_number">Vesszők maximális száma</string>
+    <string name="distances">Távolságok</string>
+    <string name="diameters">Átmérők</string>
+    <string name="bows">Íjak</string>
+    <string name="reset">Visszaállitás</string>
+    <string name="end_x_of_y">Sorozat %1$d/%2$d</string>
+    <string name="round_x_of_y">Forduló %1$d/%2$d</string>
+    <string name="settings_summary_timer">Az időzítő viselkedésének beállítása</string>
+    <string name="settings_summary_scoreboard">Az eredménytábla megjelentítése</string>
+    <string name="settings_summary_input">Bemeneti képernyő testreszabása</string>
+    <string name="settings_summary_overview">Edzések, találatok és sorozatok megjelenítésének beállításai</string>
+    <string name="settings_summary_profile">Személyes adatok kezelése</string>
+    <string name="licence_number">Engedély száma</string>
+    <string name="file_type">Fájl típusa</string>
+    <string name="clear">Kiürít</string>
+    <string name="tap_to_sign">Megnyitásához érintse meg</string>
+    <string name="pdf_file">PDF-fájl</string>
+    <string name="image_file">Képfájl</string>
+    <string name="settings_summary_statistics">Állítsa be a statisztika képernyőt</string>
+    <string name="settings_statistics_spots_to_single_target">Összesített pontok egyetlen lőlapon</string>
+    <string name="keep_above_lockscreen">Tartsa a zárolt képernyőn</string>
+    <string name="scoreboard_title_all_rounds">Forduló összesítő</string>
+    <string name="permission_required">Engedély szükséges</string>
+    <string name="backup_permission_explanation"><![CDATA[Ahhoz, hogy egy biztonsági másolatot készíts az adatokról, az alkalmazásnak engedélyre van szüksége az eszköz belső tárterületéhez. A további használathoz engedélyezze a hozzáférést: Beállítások &gt; Alkalmazások &gt; MyTargets &gt; Engedélyek a \'Tárolóeszköz\ ".]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index bdbec616c..2c978ee19 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opsi</string>
-  <string name="settings">Pengaturan</string>
-  <string name="prev">Sebelum</string>
-  <string name="next">Lanjut</string>
-  <string name="save">Simpan</string>
-  <string name="custom">Adat</string>
-  <string name="training">Latihan</string>
-  <string name="bow">Busur</string>
-  <string name="arrow">Anak panah</string>
-  <string name="round">Seri</string>
-  <string name="points">Nilai</string>
-  <string name="passe">Akhir</string>
-  <!-- Overview -->
-  <string name="new_training">Baru pelatihan</string>
-  <string name="new_bow">Busur baru</string>
-  <string name="new_arrow">Anak panah baru</string>
-  <string name="new_round">Seri baru</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d pelatihan dipilih</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d busur dipilih</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d panah dipilih</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d berakhir dipilih</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Hapus</string>
-  <string name="statistic">Statistik</string>
-  <!-- Share -->
-  <string name="share">Bagikan</string>
-  <string name="dispersion_pattern">Pola dispersi</string>
-  <string name="sharing_failed">Berbagi gagal!</string>
-  <!-- Export -->
-  <string name="send_exported">Kirim data yang diekspor</string>
-  <string name="exporting_failed">Mengekspor gagal!</string>
-  <!-- New bow -->
-  <string name="add_bow">Tambahkan busur</string>
-  <string name="name">Nama</string>
-  <string name="bow_type">Tipe busur</string>
-  <string name="properties">Properti</string>
-  <string name="brand">Merek</string>
-  <string name="size">Ukuran</string>
-  <string name="description">Deskripsi</string>
-  <string name="height">Brace tinggi</string>
-  <string name="tiller">Petani</string>
-  <string name="sight_settings">Pengaturan penglihatan</string>
-  <string name="add">Menambahkan</string>
-  <string name="take_picture">Ambil gambar</string>
-  <string name="pick_from_gallery">Pilih gambar dari galeri</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Tambahkan anak panah</string>
-  <string name="length">Panjang</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Berat</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Judul</string>
-  <string name="outdoor">Luar ruangan</string>
-  <string name="indoor">Dalam</string>
-  <string name="distance">Jarak</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d berakhir</item>
-  </plurals>
-  <string name="with">dari</string>
-  <plurals name="arrow">
-    <item quantity="other">%d panah</item>
-  </plurals>
-  <string name="target_face">Sasaran wajah</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Papan nilai</string>
-  <string name="arrows">Panah panah</string>
-  <string name="sum">Nilai</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Mencetak</string>
-  <string name="average">Rata-rata</string>
-  <!-- Input mode -->
-  <string name="comment">Komentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Pilih berkas</string>
-  <string name="dir_not_created">Tidak dapat membuat direktori!</string>
-  <string name="import_failed">Impor gagal!</string>
-  <string name="file_not_found">Berkas tidak ditemukan!</string>
-  <string name="failed_reading_file">Gagal membaca berkas!</string>
-  <!-- Donate -->
-  <string name="donate_2">Sumbang aku burger</string>
-  <string name="donate_5">Sumbang aku kebab</string>
-  <string name="donate_10">Sumbang aku pizza besar</string>
-  <string name="donate_20">Sumbang saya beberapa bahan bakar</string>
-  <string name="donation_thank">Terima kasih atas dukungan anda!</string>
-  <string name="donate_text" formatted="false">Jumlahnya termasuk PPN dan 30% biaya untuk Google. Atau Anda mungkin dengan senang hati menyumbang di akun PayPal dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Penghitung Waktu</string>
-  <string name="touch_to_start">Sentuh untuk memulai</string>
-  <string name="preparation">Siap-siap</string>
-  <string name="shooting">Penembakan</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Waktu Penembakan</string>
-  <string name="timer_waiting_time">Siapkan Waktu</string>
-  <string name="timer_warning_time">Waktu Peringatan</string>
-  <string name="timer_sound">Suara</string>
-  <string name="timer_vibrate">Getar</string>
-  <!-- Settings -->
-  <string name="backup_action">Pengaturan cadangan</string>
-  <string name="import_action">Impor</string>
-  <string name="exports_as_csv">Ekspor sebagai csv</string>
-  <string name="licences">Lisensi sumber terbuka</string>
-  <string name="licences_summary">Catatan hukum untuk lisensi</string>
-  <string name="version">Versi %s</string>
-  <plurals name="second">
-    <item quantity="other">%d detik</item>
-  </plurals>
-  <string name="info">Informasi</string>
-  <string name="data">Data</string>
-  <string name="weather">Cuaca</string>
-  <string name="environment">Lingkungan</string>
-  <string name="wind_speed">Kecepatan angin</string>
-  <string name="wind_direction">Arah angin</string>
-  <string name="sight_setting_removed">Pengaturan sight dihapus!</string>
-  <string name="metric">Metrik</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Membuka</string>
-  <string name="standard_rounds">Putaran standar</string>
-  <string name="expand_collapse">Perluas / Tutup</string>
-  <string name="new_round_template">Template baru</string>
-  <string name="arrow_numbers">Nomor anak panah</string>
-  <string name="round_removed">Putaran dihapus!</string>
-  <string name="custom_round">Putaran kustom</string>
-  <string name="filter">Menyaring</string>
-  <string name="club">Klub</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Putaran standar</string>
-  <string name="use_as_template">Gunakan sebagai template?</string>
-  <string name="create_copy">Ini adalah putaran standar!\nApakah Anda ingin membuat salinan untuk mengeditnya?</string>
-  <string name="practice">Praktek</string>
-  <string name="edit_training">Edit Pelatihan</string>
-  <string name="edit_standard_round">Edit Putaran Standar</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d panah dihapus</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d busur dihapus</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d pelatihan dihapus</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d berakhir dihapus</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">Putaran %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d putaran dipilih</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d putaran dihapus</item>
-  </plurals>
-  <string name="date">Tanggal</string>
-  <string name="edit_round">Edit putaran</string>
-  <string name="draw_weight">Menarik berat</string>
-  <string name="sight">Melihat</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">Busur saya</string>
-  <string name="my_arrow">Anak panah saya</string>
-  <string name="tip_weight">Tip berat</string>
-  <string name="arrow_ranking">Peringkat panah</string>
-  <string name="arrow_x_of_set_of_arrows">Panah %1$s dari %2$s</string>
-  <string name="display">Tampilan</string>
-  <string name="print">Cetak</string>
-  <string name="table">Tabel</string>
-  <string name="comments">Komentar</string>
-  <string name="show_points_colored">Tunjukkan titik berwarna</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Nomor panah %s</string>
-  <string name="training_with_standard_round">Pelatihan dengan Putaran Standar</string>
-  <string name="free_training">Pelatihan Gratis</string>
-  <string name="competition">Kompetisi</string>
-  <string name="about">Tentang</string>
-  <string name="general">Umum</string>
-  <string name="contribute">Menyumbang</string>
-  <string name="connect">Menghubungkan</string>
-  <string name="special_thanks_to">Terima kasih khusus</string>
-  <string name="all_translators">Semua orang, yang membantu menerjemahkan apl!</string>
-  <string name="all_beta_testers">Semua orang yang bergabung dengan grup penguji beta dan karena itu membantu memperbaiki aplikasi secara terus-menerus.</string>
-  <string name="test_beta">Uji versi beta terbaru</string>
-  <string name="join_on_google_plus">Bergabunglah dengan kami di Google+</string>
-  <string name="share_with_friends">Bagikan dengan temanmu</string>
-  <string name="donate">Donasi</string>
-  <string name="donate_via_paypal">Donasi melalui PayPal</string>
-  <string name="translate_crowdin">Terjemahkan pada Crowdin</string>
-  <string name="network_linkedin">Jaringan di LinkedIn</string>
-  <string name="search">Pencarian</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Seluruh latihan</string>
-  <string name="show_shots_round">Putaran saat ini</string>
-  <string name="show_shots_end">Akhir saat ini</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Tanggal lahir</string>
-  <string name="first_name">Nama depan</string>
-  <string name="last_name">Nama belakang</string>
-  <string name="age">Usia</string>
-  <string name="show_signature">Tanda tangan</string>
-  <string name="archer">Pemanah</string>
-  <string name="hits">Pukul</string>
-  <string name="misses">Lalai</string>
-  <string name="new_end">Akhir baru</string>
-  <string name="distribution">Distribusi</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Memasukkan</string>
-  <string name="target_zoom">Target tingkat zoom</string>
-  <string name="action_pdf">Ekspor sebagai PDF</string>
-  <string name="arrow_diameter_scale">Skala diameter panah</string>
-  <string name="timestamp">Stempel waktu</string>
-  <string name="change_target_face">Ubah wajah sasaran</string>
-  <string name="your_first_training">Pelatihan pertama anda</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Pengelompokan</string>
-  <string name="first_training_description">Ketuk plus untuk memulai pelatihan baru.</string>
-  <string name="show_average">Rata-rata</string>
-  <string name="show_none">Tak satupun</string>
-  <string name="left_handed">Kidal</string>
-  <string name="right_handed">Pengguna tangan kanan</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Mencadangkan data Anda memungkinkan Anda mengembalikan semua pelatihan jika Anda kehilangan atau mengganti telepon Anda.</string>
-  <string name="backup_now">Cadangkan sekarang</string>
-  <string name="last_backup">Cadangan terakhir: % s</string>
-  <string name="recent_backups">Cadangan hari ini</string>
-  <string name="dialog_restore_title">Kembali ke versi sebelumnya</string>
-  <string name="restore_desc">Mengembalikan cadangan akan menimpa semua data yang ada dengan cadangan.</string>
-  <string name="backup_details">Rincian cadangan</string>
-  <string name="restore">Mengembalikan</string>
-  <string name="backup_location">Lokasi cadangan</string>
-  <string name="internal_storage">Penyimpanan internal</string>
-  <string name="automatic_backup">Cadangan otomatis</string>
-  <string name="restoring">Memulihkan cadangan …</string>
-  <string name="restore_failed">Kembalikan gagal</string>
-  <string name="delete_failed">Penghapusan gagal</string>
-  <string name="backup_restore_desc">Cadangkan dan pulihkan data aplikasi</string>
-  <string name="exporting">Mengekspor …</string>
-  <string name="loading_backups_failed">Loading backup gagal!</string>
-  <string name="external_storage">Penyimpanan eksternal</string>
-  <string name="backup_interval">Interval cadangan</string>
-  <string name="daily">Harian</string>
-  <string name="weekly">Mingguan</string>
-  <string name="monthly">Bulanan</string>
-  <string name="connection_failed">Koneksi gagal!</string>
-  <string name="shooting_indoor">Dalam Menembak</string>
-  <string name="bow_rest_vertical_position">Posisi vertikal</string>
-  <string name="bow_rest">Beristirahat</string>
-  <string name="bow_rest_horizontal_position">Posisi horizontal</string>
-  <string name="bow_cam_settings">Pengaturan cam</string>
-  <string name="bow_letoff_weight">Melepaskan berat</string>
-  <string name="bow_nocking_point">Taktik titik</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Pembesaran ruang lingkup</string>
-  <string name="bow_rest_stiffness">Kekakuan</string>
-  <string name="bow_button">Tombol</string>
-  <string name="more_fields">Bidang lainnya</string>
-  <string name="recently_used">Baru - baru ini digunakan</string>
-  <string name="intro_title_track_training_progress">Lupakan lembar kertas!</string>
-  <string name="intro_description_track_training_progress">Dengan merencanakan panah yang tepat,\nAnda bisa mendapatkan wawasan yang lebih berguna\ndari data pelatihan Anda.</string>
-  <string name="intro_title_everything_in_one_place">Semua yang anda butuhkan\ndi satu tempat</string>
-  <string name="intro_description_everything_in_one_place">Termasuk manajemen busur, panah-\ndan sightmark,\npanahan timer, statistik\ndan banyak lagi…</string>
-  <string name="average_arrow_score_per_end">Skor rata-rata panah per akhir</string>
-  <string name="show_end">Tampilkan akhir</string>
-  <string name="show_round">Tunjukkan bulat</string>
-  <string name="show_training">Tampilkan pelatihan</string>
-  <string name="summary">Ringkasan</string>
-  <string name="end">Akhir</string>
-  <string name="average_of">Rata - rata</string>
-  <string name="displayed_shots">Ditampilkan gambar</string>
-  <string name="invalid_decimal_number">Nomor desimal tidak valid</string>
-  <string name="not_within_expected_range_mm">Tidak dalam kisaran yang diharapkan dari 1 sampai 20 mm</string>
-  <string name="not_within_expected_range_inch">Tidak dalam rentang yang diharapkan dari 0 sampai 1 inci</string>
-  <string name="next_round">Seri berikutnya</string>
-  <string name="previous_round">Seri sebelumnya</string>
-  <string name="overview">Ikhtisar</string>
-  <string name="score">Nilai</string>
-  <string name="show_reached_score">Tampilkan skor yang tercapai</string>
-  <string name="show_total_score">Tunjukkan nilai keseluruhan</string>
-  <string name="show_percentage">Tunjukkan persentase</string>
-  <string name="show_arrow_average">Tampilkan rata-rata panah</string>
-  <string name="image_deleted">Gambar dihapus</string>
-  <string name="delete_image">Hapus gambar?</string>
-  <string name="keyboard_type">Jenis keyboard</string>
-  <string name="keyboard_enabled">Keyboard diaktifkan</string>
-  <string name="sort_shots">Urutkan gambar</string>
-  <string name="sort_shots_for_spots">Urutkan gambar untuk wajah sasaran sasaran</string>
-  <string name="target_captain">Target kapten</string>
-  <string name="language">Bahasa</string>
-  <string name="warning_backup_experimental">Peringatan: Fitur ini masih eksperimental! Silakan periksa secara berkala jika backup benar-benar berhasil!</string>
-  <string name="drawer_open">Laci terbuka</string>
-  <string name="drawer_close">Tutup laci</string>
-  <string name="help">Membantu</string>
-  <string name="home">Rumah</string>
-  <string name="click_to_enter_profile">Klik untuk memasukkan informasi profil</string>
-  <string name="no_trainings">Anda belum memiliki pelatihan apapun!</string>
-  <string name="no_bows">Tidak ada busur</string>
-  <string name="no_arrows">Tidak ada anak panah</string>
-  <string name="version_info">Informasi versi</string>
-  <string name="version_prefix">Versi</string>
-  <string name="max_arrow_number">Nomor panah maksimum</string>
-  <string name="distances">Jarak</string>
-  <string name="diameters">Diameter</string>
-  <string name="bows">Busur</string>
-  <string name="reset">Setel ulang</string>
-  <string name="end_x_of_y">Akhir %1$d/%2$d</string>
-  <string name="round_x_of_y">Seri %1$d/%2$d</string>
-  <string name="settings_summary_timer">Sesuaikan perilaku panahan timer \'</string>
-  <string name="settings_summary_scoreboard">Ubah tampilan papan skor</string>
-  <string name="settings_summary_input">Sesuaikan layar masukan</string>
-  <string name="settings_summary_overview">Personalisasikan informasi yang ditunjukkan untuk pelatihan, putaran dan akhir</string>
-  <string name="settings_summary_profile">Masukkan informasi pribadi</string>
-  <string name="licence_number">Nomor lisensi</string>
-  <string name="file_type">Jenis file</string>
-  <string name="clear">Bersih</string>
-  <string name="tap_to_sign">Ketuk untuk masuk</string>
-  <string name="pdf_file">File pdf</string>
-  <string name="image_file">File gambar</string>
-  <string name="settings_summary_statistics">Sesuaikan layar statistik</string>
-  <string name="settings_statistics_spots_to_single_target">Bintik agregat ke target tunggal</string>
-  <string name="keep_above_lockscreen">Simpan di atas layar lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opsi</string>
+    <string name="settings">Pengaturan</string>
+    <string name="prev">Sebelum</string>
+    <string name="next">Lanjut</string>
+    <string name="save">Simpan</string>
+    <string name="custom">Adat</string>
+    <string name="training">Latihan</string>
+    <string name="bow">Busur</string>
+    <string name="arrow">Anak panah</string>
+    <string name="round">Seri</string>
+    <string name="points">Nilai</string>
+    <string name="passe">Akhir</string>
+    <!-- Overview -->
+    <string name="new_training">Baru pelatihan</string>
+    <string name="new_bow">Busur baru</string>
+    <string name="new_arrow">Anak panah baru</string>
+    <string name="new_round">Seri baru</string>
+    <plurals name="training_selected">
+        <item quantity="other">%d pelatihan dipilih</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">%d busur dipilih</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">%d panah dipilih</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">%d berakhir dipilih</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Hapus</string>
+    <string name="statistic">Statistik</string>
+    <!-- Share -->
+    <string name="share">Bagikan</string>
+    <string name="dispersion_pattern">Pola dispersi</string>
+    <string name="sharing_failed">Berbagi gagal!</string>
+    <!-- Export -->
+    <string name="send_exported">Kirim data yang diekspor</string>
+    <string name="exporting_failed">Mengekspor gagal!</string>
+    <!-- New bow -->
+    <string name="add_bow">Tambahkan busur</string>
+    <string name="name">Nama</string>
+    <string name="bow_type">Tipe busur</string>
+    <string name="properties">Properti</string>
+    <string name="brand">Merek</string>
+    <string name="size">Ukuran</string>
+    <string name="description">Deskripsi</string>
+    <string name="height">Brace tinggi</string>
+    <string name="tiller">Petani</string>
+    <string name="sight_settings">Pengaturan penglihatan</string>
+    <string name="add">Menambahkan</string>
+    <string name="take_picture">Ambil gambar</string>
+    <string name="pick_from_gallery">Pilih gambar dari galeri</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Tambahkan anak panah</string>
+    <string name="length">Panjang</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Berat</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Judul</string>
+    <string name="outdoor">Luar ruangan</string>
+    <string name="indoor">Dalam</string>
+    <string name="distance">Jarak</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d berakhir</item>
+    </plurals>
+    <string name="with">dari</string>
+    <plurals name="arrow">
+        <item quantity="other">%d panah</item>
+    </plurals>
+    <string name="target_face">Sasaran wajah</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Papan nilai</string>
+    <string name="arrows">Panah panah</string>
+    <string name="sum">Nilai</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Mencetak</string>
+    <string name="average">Rata-rata</string>
+    <!-- Input mode -->
+    <string name="comment">Komentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Pilih berkas</string>
+    <string name="dir_not_created">Tidak dapat membuat direktori!</string>
+    <string name="import_failed">Impor gagal!</string>
+    <string name="file_not_found">Berkas tidak ditemukan!</string>
+    <string name="failed_reading_file">Gagal membaca berkas!</string>
+    <!-- Donate -->
+    <string name="donate_2">Sumbang aku burger</string>
+    <string name="donate_5">Sumbang aku kebab</string>
+    <string name="donate_10">Sumbang aku pizza besar</string>
+    <string name="donate_20">Sumbang saya beberapa bahan bakar</string>
+    <string name="donation_thank">Terima kasih atas dukungan anda!</string>
+    <string name="donate_text" formatted="false">Jumlahnya termasuk PPN dan 30% biaya untuk Google. Atau Anda mungkin dengan senang hati menyumbang di akun PayPal dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Penghitung Waktu</string>
+    <string name="touch_to_start">Sentuh untuk memulai</string>
+    <string name="preparation">Siap-siap</string>
+    <string name="shooting">Penembakan</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Waktu Penembakan</string>
+    <string name="timer_waiting_time">Siapkan Waktu</string>
+    <string name="timer_warning_time">Waktu Peringatan</string>
+    <string name="timer_sound">Suara</string>
+    <string name="timer_vibrate">Getar</string>
+    <!-- Settings -->
+    <string name="backup_action">Pengaturan cadangan</string>
+    <string name="import_action">Impor</string>
+    <string name="exports_as_csv">Ekspor sebagai csv</string>
+    <string name="licences">Lisensi sumber terbuka</string>
+    <string name="licences_summary">Catatan hukum untuk lisensi</string>
+    <string name="version">Versi %s</string>
+    <plurals name="second">
+        <item quantity="other">%d detik</item>
+    </plurals>
+    <string name="info">Informasi</string>
+    <string name="data">Data</string>
+    <string name="weather">Cuaca</string>
+    <string name="environment">Lingkungan</string>
+    <string name="wind_speed">Kecepatan angin</string>
+    <string name="wind_direction">Arah angin</string>
+    <string name="sight_setting_removed">Pengaturan sight dihapus!</string>
+    <string name="metric">Metrik</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Membuka</string>
+    <string name="standard_rounds">Putaran standar</string>
+    <string name="expand_collapse">Perluas / Tutup</string>
+    <string name="new_round_template">Template baru</string>
+    <string name="arrow_numbers">Nomor anak panah</string>
+    <string name="round_removed">Putaran dihapus!</string>
+    <string name="custom_round">Putaran kustom</string>
+    <string name="filter">Menyaring</string>
+    <string name="club">Klub</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Putaran standar</string>
+    <string name="use_as_template">Gunakan sebagai template?</string>
+    <string name="create_copy">Ini adalah putaran standar!\nApakah Anda ingin membuat salinan untuk mengeditnya?</string>
+    <string name="practice">Praktek</string>
+    <string name="edit_training">Edit Pelatihan</string>
+    <string name="edit_standard_round">Edit Putaran Standar</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d panah dihapus</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d busur dihapus</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d pelatihan dihapus</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d berakhir dihapus</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">Putaran %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d putaran dipilih</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">%d putaran dihapus</item>
+    </plurals>
+    <string name="date">Tanggal</string>
+    <string name="edit_round">Edit putaran</string>
+    <string name="draw_weight">Menarik berat</string>
+    <string name="sight">Melihat</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">Busur saya</string>
+    <string name="my_arrow">Anak panah saya</string>
+    <string name="tip_weight">Tip berat</string>
+    <string name="arrow_ranking">Peringkat panah</string>
+    <string name="arrow_x_of_set_of_arrows">Panah %1$s dari %2$s</string>
+    <string name="display">Tampilan</string>
+    <string name="print">Cetak</string>
+    <string name="table">Tabel</string>
+    <string name="comments">Komentar</string>
+    <string name="show_points_colored">Tunjukkan titik berwarna</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Nomor panah %s</string>
+    <string name="training_with_standard_round">Pelatihan dengan Putaran Standar</string>
+    <string name="free_training">Pelatihan Gratis</string>
+    <string name="competition">Kompetisi</string>
+    <string name="about">Tentang</string>
+    <string name="general">Umum</string>
+    <string name="contribute">Menyumbang</string>
+    <string name="connect">Menghubungkan</string>
+    <string name="special_thanks_to">Terima kasih khusus</string>
+    <string name="all_translators">Semua orang, yang membantu menerjemahkan apl!</string>
+    <string name="all_beta_testers">Semua orang yang bergabung dengan grup penguji beta dan karena itu membantu memperbaiki aplikasi secara terus-menerus.</string>
+    <string name="test_beta">Uji versi beta terbaru</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Bagikan dengan temanmu</string>
+    <string name="donate">Donasi</string>
+    <string name="donate_via_paypal">Donasi melalui PayPal</string>
+    <string name="translate_crowdin">Terjemahkan pada Crowdin</string>
+    <string name="network_linkedin">Jaringan di LinkedIn</string>
+    <string name="search">Pencarian</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Seluruh latihan</string>
+    <string name="show_shots_round">Putaran saat ini</string>
+    <string name="show_shots_end">Akhir saat ini</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Tanggal lahir</string>
+    <string name="first_name">Nama depan</string>
+    <string name="last_name">Nama belakang</string>
+    <string name="age">Usia</string>
+    <string name="show_signature">Tanda tangan</string>
+    <string name="archer">Pemanah</string>
+    <string name="hits">Pukul</string>
+    <string name="misses">Lalai</string>
+    <string name="new_end">Akhir baru</string>
+    <string name="distribution">Distribusi</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Memasukkan</string>
+    <string name="target_zoom">Target tingkat zoom</string>
+    <string name="action_pdf">Ekspor sebagai PDF</string>
+    <string name="arrow_diameter_scale">Skala diameter panah</string>
+    <string name="timestamp">Stempel waktu</string>
+    <string name="change_target_face">Ubah wajah sasaran</string>
+    <string name="your_first_training">Pelatihan pertama anda</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Pengelompokan</string>
+    <string name="first_training_description">Ketuk plus untuk memulai pelatihan baru.</string>
+    <string name="show_average">Rata-rata</string>
+    <string name="show_none">Tak satupun</string>
+    <string name="left_handed">Kidal</string>
+    <string name="right_handed">Pengguna tangan kanan</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Mencadangkan data Anda memungkinkan Anda mengembalikan semua pelatihan jika Anda kehilangan atau mengganti telepon Anda.</string>
+    <string name="backup_now">Cadangkan sekarang</string>
+    <string name="last_backup">Cadangan terakhir: % s</string>
+    <string name="recent_backups">Cadangan hari ini</string>
+    <string name="dialog_restore_title">Kembali ke versi sebelumnya</string>
+    <string name="restore_desc">Mengembalikan cadangan akan menimpa semua data yang ada dengan cadangan.</string>
+    <string name="backup_details">Rincian cadangan</string>
+    <string name="restore">Mengembalikan</string>
+    <string name="backup_location">Lokasi cadangan</string>
+    <string name="internal_storage">Penyimpanan internal</string>
+    <string name="automatic_backup">Cadangan otomatis</string>
+    <string name="restoring">Memulihkan cadangan …</string>
+    <string name="restore_failed">Kembalikan gagal</string>
+    <string name="delete_failed">Penghapusan gagal</string>
+    <string name="backup_restore_desc">Cadangkan dan pulihkan data aplikasi</string>
+    <string name="exporting">Mengekspor …</string>
+    <string name="loading_backups_failed">Loading backup gagal!</string>
+    <string name="external_storage">Penyimpanan eksternal</string>
+    <string name="backup_interval">Interval cadangan</string>
+    <string name="daily">Harian</string>
+    <string name="weekly">Mingguan</string>
+    <string name="monthly">Bulanan</string>
+    <string name="connection_failed">Koneksi gagal!</string>
+    <string name="shooting_indoor">Dalam Menembak</string>
+    <string name="bow_rest_vertical_position">Posisi vertikal</string>
+    <string name="bow_rest">Beristirahat</string>
+    <string name="bow_rest_horizontal_position">Posisi horizontal</string>
+    <string name="bow_cam_settings">Pengaturan cam</string>
+    <string name="bow_letoff_weight">Melepaskan berat</string>
+    <string name="bow_nocking_point">Taktik titik</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Pembesaran ruang lingkup</string>
+    <string name="bow_rest_stiffness">Kekakuan</string>
+    <string name="bow_button">Tombol</string>
+    <string name="more_fields">Bidang lainnya</string>
+    <string name="recently_used">Baru - baru ini digunakan</string>
+    <string name="intro_title_track_training_progress">Lupakan lembar kertas!</string>
+    <string name="intro_description_track_training_progress">Dengan merencanakan panah yang tepat,\nAnda bisa mendapatkan wawasan yang lebih berguna\ndari data pelatihan Anda.</string>
+    <string name="intro_title_everything_in_one_place">Semua yang anda butuhkan\ndi satu tempat</string>
+    <string name="intro_description_everything_in_one_place">Termasuk manajemen busur, panah-\ndan sightmark,\npanahan timer, statistik\ndan banyak lagi…</string>
+    <string name="average_arrow_score_per_end">Skor rata-rata panah per akhir</string>
+    <string name="show_end">Tampilkan akhir</string>
+    <string name="show_round">Tunjukkan bulat</string>
+    <string name="show_training">Tampilkan pelatihan</string>
+    <string name="summary">Ringkasan</string>
+    <string name="end">Akhir</string>
+    <string name="average_of">Rata - rata</string>
+    <string name="displayed_shots">Ditampilkan gambar</string>
+    <string name="invalid_decimal_number">Nomor desimal tidak valid</string>
+    <string name="not_within_expected_range_mm">Tidak dalam kisaran yang diharapkan dari 1 sampai 20 mm</string>
+    <string name="not_within_expected_range_inch">Tidak dalam rentang yang diharapkan dari 0 sampai 1 inci</string>
+    <string name="next_round">Seri berikutnya</string>
+    <string name="previous_round">Seri sebelumnya</string>
+    <string name="overview">Ikhtisar</string>
+    <string name="score">Nilai</string>
+    <string name="show_reached_score">Tampilkan skor yang tercapai</string>
+    <string name="show_total_score">Tunjukkan nilai keseluruhan</string>
+    <string name="show_percentage">Tunjukkan persentase</string>
+    <string name="show_arrow_average">Tampilkan rata-rata panah</string>
+    <string name="image_deleted">Gambar dihapus</string>
+    <string name="delete_image">Hapus gambar?</string>
+    <string name="keyboard_type">Jenis keyboard</string>
+    <string name="keyboard_enabled">Keyboard diaktifkan</string>
+    <string name="sort_shots">Urutkan gambar</string>
+    <string name="sort_shots_for_spots">Urutkan gambar untuk wajah sasaran sasaran</string>
+    <string name="target_captain">Target kapten</string>
+    <string name="language">Bahasa</string>
+    <string name="warning_backup_experimental">Peringatan: Fitur ini masih eksperimental! Silakan periksa secara berkala jika backup benar-benar berhasil!</string>
+    <string name="drawer_open">Laci terbuka</string>
+    <string name="drawer_close">Tutup laci</string>
+    <string name="help">Membantu</string>
+    <string name="home">Rumah</string>
+    <string name="click_to_enter_profile">Klik untuk memasukkan informasi profil</string>
+    <string name="no_trainings">Anda belum memiliki pelatihan apapun!</string>
+    <string name="no_bows">Tidak ada busur</string>
+    <string name="no_arrows">Tidak ada anak panah</string>
+    <string name="version_info">Informasi versi</string>
+    <string name="version_prefix">Versi</string>
+    <string name="max_arrow_number">Nomor panah maksimum</string>
+    <string name="distances">Jarak</string>
+    <string name="diameters">Diameter</string>
+    <string name="bows">Busur</string>
+    <string name="reset">Setel ulang</string>
+    <string name="end_x_of_y">Akhir %1$d/%2$d</string>
+    <string name="round_x_of_y">Seri %1$d/%2$d</string>
+    <string name="settings_summary_timer">Sesuaikan perilaku panahan timer \'</string>
+    <string name="settings_summary_scoreboard">Ubah tampilan papan skor</string>
+    <string name="settings_summary_input">Sesuaikan layar masukan</string>
+    <string name="settings_summary_overview">Personalisasikan informasi yang ditunjukkan untuk pelatihan, putaran dan akhir</string>
+    <string name="settings_summary_profile">Masukkan informasi pribadi</string>
+    <string name="licence_number">Nomor lisensi</string>
+    <string name="file_type">Jenis file</string>
+    <string name="clear">Bersih</string>
+    <string name="tap_to_sign">Ketuk untuk masuk</string>
+    <string name="pdf_file">File pdf</string>
+    <string name="image_file">File gambar</string>
+    <string name="settings_summary_statistics">Sesuaikan layar statistik</string>
+    <string name="settings_statistics_spots_to_single_target">Bintik agregat ke target tunggal</string>
+    <string name="keep_above_lockscreen">Simpan di atas layar lockscreen</string>
+    <string name="scoreboard_title_all_rounds">Semua ronde</string>
+    <string name="permission_required">Izin dibutuhkan</string>
+    <string name="backup_permission_explanation"><![CDATA[Untuk dapat membuat cadangan data Anda, aplikasi membutuhkan izin untuk mengakses penyimpanan internal telepon seluler Anda. Untuk menggunakan fitur cadangan pergi ke pengaturan sistem > Aplikasi > MyTargets > Perizinan dan mengaktifkan pilihan \'Penyimpanan\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6e7867a79..e5b372a4e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opzioni</string>
-  <string name="settings">Impostazioni</string>
-  <string name="prev">Precedente</string>
-  <string name="next">Successivo</string>
-  <string name="save">Salva</string>
-  <string name="custom">Personalizzato</string>
-  <string name="training">Allenamento</string>
-  <string name="bow">Arco</string>
-  <string name="arrow">Freccia</string>
-  <string name="round">Round</string>
-  <string name="points">Punti</string>
-  <string name="passe">Volée</string>
-  <!-- Overview -->
-  <string name="new_training">Nuovo allenamento</string>
-  <string name="new_bow">Nuovo arco</string>
-  <string name="new_arrow">Nuova freccia</string>
-  <string name="new_round">Nuovo round</string>
-  <plurals name="training_selected">
-    <item quantity="one">Un allenamento selezionato</item>
-    <item quantity="other">%d allenamenti selezionati</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Un arco selezionato</item>
-    <item quantity="other">%d archi selezionati</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Una freccia selezionata</item>
-    <item quantity="other">%d frecce selezionate</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Una volée selezionata</item>
-    <item quantity="other">%d volée selezionate</item>
-  </plurals>
-  <string name="edit">Modifica</string>
-  <string name="delete">Elimina</string>
-  <string name="statistic">Statistiche</string>
-  <!-- Share -->
-  <string name="share">Condividi</string>
-  <string name="dispersion_pattern">modello di dispersione</string>
-  <string name="sharing_failed">Condivisione fallita!</string>
-  <!-- Export -->
-  <string name="send_exported">Invia dati esportati</string>
-  <string name="exporting_failed">Esportazione fallita!</string>
-  <!-- New bow -->
-  <string name="add_bow">Aggiungi arco</string>
-  <string name="name">Nome</string>
-  <string name="bow_type">Tipo di arco</string>
-  <string name="properties">Proprietà</string>
-  <string name="brand">Marca</string>
-  <string name="size">Misura</string>
-  <string name="description">Descrizione</string>
-  <string name="height">Altezza brace</string>
-  <string name="tiller">Timone</string>
-  <string name="sight_settings">Impstazioni vista</string>
-  <string name="add">Aggiungi</string>
-  <string name="take_picture">Scatta una foto</string>
-  <string name="pick_from_gallery">Seleziona un\'immagine dalla galleria</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Aggiungi freccia</string>
-  <string name="length">Lunghezza</string>
-  <string name="spine">Punta</string>
-  <string name="weight">Peso</string>
-  <string name="vanes">Alette</string>
-  <string name="nock">Cocca</string>
-  <string name="material">Materiale</string>
-  <!-- New round -->
-  <string name="title">Titolo</string>
-  <string name="outdoor">All\'aperto</string>
-  <string name="indoor">Al chiuso</string>
-  <string name="distance">Distanza</string>
-  <string name="format">Formato</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">1 volée</item>
-    <item quantity="other">%d volée</item>
-  </plurals>
-  <string name="with">di</string>
-  <plurals name="arrow">
-    <item quantity="one">una freccia</item>
-    <item quantity="other">%d frecce</item>
-  </plurals>
-  <string name="target_face">Targa</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Segnapunti</string>
-  <string name="arrows">Frecce</string>
-  <string name="sum">Totale</string>
-  <string name="carry">Sposta</string>
-  <string name="action_print">Stampa</string>
-  <string name="average">Media</string>
-  <!-- Input mode -->
-  <string name="comment">Commento</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Seleziona un file</string>
-  <string name="dir_not_created">La directory non può essere creata!</string>
-  <string name="import_failed">Importazione fallita!</string>
-  <string name="file_not_found">File non trovato!</string>
-  <string name="failed_reading_file">Lettura del file fallita!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donami un hambuger</string>
-  <string name="donate_5">Donami un kebab</string>
-  <string name="donate_10">Donami una pizza farcita</string>
-  <string name="donate_20">Donami un po\' di benzina</string>
-  <string name="donation_thank">Grazie per il tuo supporto!</string>
-  <string name="donate_text" formatted="false">Gli importi sono comprensivi di IVA e 30% di commissioni Google. In alternativa si può donare sul conto PayPal dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Tocca per avviare</string>
-  <string name="preparation">Stai pronto</string>
-  <string name="shooting">Rilascia</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Tempo limite</string>
-  <string name="timer_waiting_time">Tempo di preparazione</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Suono</string>
-  <string name="timer_vibrate">Vibrazione</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Importa</string>
-  <string name="exports_as_csv">Esporta in formato csv</string>
-  <string name="licences">Licenze Open Source</string>
-  <string name="licences_summary">Note legali sulle licenze</string>
-  <string name="version">Versione %s</string>
-  <plurals name="second">
-    <item quantity="one">%d secondo</item>
-    <item quantity="other">%d secondi</item>
-  </plurals>
-  <string name="info">Informazioni</string>
-  <string name="data">Dati</string>
-  <string name="weather">Meteo</string>
-  <string name="environment">Ambiente</string>
-  <string name="wind_speed">Velocità del vento</string>
-  <string name="wind_direction">Direzione del vento</string>
-  <string name="sight_setting_removed">Impostazioni mirino cancellate!</string>
-  <string name="metric">Metrico</string>
-  <string name="imperial">Imperiale</string>
-  <string name="undo">Annulla</string>
-  <string name="standard_rounds">Sessioni Standard</string>
-  <string name="expand_collapse">Espandi/Comprimi</string>
-  <string name="new_round_template">Nuovo modello</string>
-  <string name="arrow_numbers">Numero delle frecce</string>
-  <string name="round_removed">Sessione cancellata!</string>
-  <string name="custom_round">Sessione personalizzata</string>
-  <string name="filter">Filtro</string>
-  <string name="club">Club</string>
-  <string name="target">Bersaglio</string>
-  <string name="standard_round">Sessione Standard</string>
-  <string name="use_as_template">Usa come modello?</string>
-  <string name="create_copy">Questa è una sessione standard!\nVuoi crearne una copia per modificarla?</string>
-  <string name="practice">Allenamento</string>
-  <string name="edit_training">Modifica Allenamento</string>
-  <string name="edit_standard_round">Modifica Sessione Standard</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d freccia cancellata</item>
-    <item quantity="other">%d frecce cancellate</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d arco cancellato</item>
-    <item quantity="other">%d archi cancellati</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d allenamento cancellato</item>
-    <item quantity="other">%d allenamenti cancellati</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d volée cancellate</item>
-    <item quantity="other">%d volée cancellate</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Sessione %d</item>
-    <item quantity="other">Sessioni %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selezionati</item>
-    <item quantity="other">%d round selezionati</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round annullati</item>
-    <item quantity="other">%d round cancellati</item>
-  </plurals>
-  <string name="date">Data</string>
-  <string name="edit_round">Modifica sessione</string>
-  <string name="draw_weight">Potenza arco</string>
-  <string name="sight">Mirino</string>
-  <string name="limbs">Flettenti</string>
-  <string name="my_bow">Il Mio Arco</string>
-  <string name="my_arrow">Le Mie Frecce</string>
-  <string name="tip_weight">Peso della punta</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Freccia %1$s di %2$s</string>
-  <string name="display">Mostra</string>
-  <string name="print">Stampa</string>
-  <string name="table">Table</string>
-  <string name="comments">Commenti</string>
-  <string name="show_points_colored">Mostra colori dei punti</string>
-  <string name="stabilizer">Stabilizzatore</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Numero della freccia %s</string>
-  <string name="training_with_standard_round">Allenamento con Sessioni Standard</string>
-  <string name="free_training">Allenamento Libero</string>
-  <string name="competition">Competizione</string>
-  <string name="about">About</string>
-  <string name="general">Generali</string>
-  <string name="contribute">Conrribiusci</string>
-  <string name="connect">Contatti</string>
-  <string name="special_thanks_to">Ringraziamenti</string>
-  <string name="all_translators">Tutti coloro che hanno aiutato nella traduzione dell\'app!</string>
-  <string name="all_beta_testers">Gli utenti che si sono uniti al gruppo di beta tester, che contribuiscono costantemente al miglioramento dell\'app.</string>
-  <string name="test_beta">Prova l\'ultima versione beta</string>
-  <string name="join_on_google_plus">Aggiungici a Google+</string>
-  <string name="share_with_friends">Condividi con gli amici</string>
-  <string name="donate">Fai una donazione</string>
-  <string name="donate_via_paypal">Dona con Paypal</string>
-  <string name="translate_crowdin">Traduci su Crowdin</string>
-  <string name="network_linkedin">Rete di LinkedIn</string>
-  <string name="search">Cerca</string>
-  <string name="us">USA</string>
-  <string name="show_shots_training">Sessione completa</string>
-  <string name="show_shots_round">Sessione corrente</string>
-  <string name="show_shots_end">Volée corrente</string>
-  <string name="profile">Profilo</string>
-  <string name="birthday">Compleanno</string>
-  <string name="first_name">Nome</string>
-  <string name="last_name">Cognome</string>
-  <string name="age">Età</string>
-  <string name="show_signature">Firma</string>
-  <string name="archer">Arciere</string>
-  <string name="hits">A segno</string>
-  <string name="misses">Miss</string>
-  <string name="new_end">Nuova volée</string>
-  <string name="distribution">Distribuzione</string>
-  <string name="count">Conteggio</string>
-  <string name="diameter">Diametro</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Livello di zoom della targa</string>
-  <string name="action_pdf">Esporta come PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Data e ora</string>
-  <string name="change_target_face">Cambia targa</string>
-  <string name="your_first_training">Il tuo primo allenamento</string>
-  <string name="grouping">Raggruppamento</string>
-  <string name="show_clusters">Cluster</string>
-  <string name="first_training_description">Tocca il più per avviare un nuovo allenamento.</string>
-  <string name="show_average">Media</string>
-  <string name="show_none">Nessuna</string>
-  <string name="left_handed">Mancino</string>
-  <string name="right_handed">Destrorso</string>
-  <string name="keyboard">Tastiera</string>
-  <string name="backup_drive_desc">Effettuare un backup dei dati ti permette di ripristinare i tuoi allenamenti qualora perdessi o cambiassi il telefono.</string>
-  <string name="backup_now">Esegui il backup ora</string>
-  <string name="last_backup">Ultimo backup: %s</string>
-  <string name="recent_backups">Backup recenti</string>
-  <string name="dialog_restore_title">Torna a versione precedente</string>
-  <string name="restore_desc">Ripristinare il tuo backup sovrascriverà tutti i dati esitenti con quelli contenuti nel backup.</string>
-  <string name="backup_details">Dettagli backup</string>
-  <string name="restore">Ripristina</string>
-  <string name="backup_location">Posizione del backup</string>
-  <string name="internal_storage">Archivio interno</string>
-  <string name="automatic_backup">Backup automatico</string>
-  <string name="restoring">Ripristino backup…</string>
-  <string name="restore_failed">Ripristino non riuscito</string>
-  <string name="delete_failed">Cancellazione fallita</string>
-  <string name="backup_restore_desc">Backup e ripristino dati app</string>
-  <string name="exporting">Esportazione…</string>
-  <string name="loading_backups_failed">Caricamento del backup fallito!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Giornaliero</string>
-  <string name="weekly">Settimanale</string>
-  <string name="monthly">Mensile</string>
-  <string name="connection_failed">Connessione fallita!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Sommario</string>
-  <string name="score">Punteggio</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Tipo di tastiera</string>
-  <string name="keyboard_enabled">Tastiera attiva</string>
-  <string name="sort_shots">Ordina i tiri</string>
-  <string name="sort_shots_for_spots">Ordina i tiri per tipo di targa</string>
-  <string name="target_captain">Marcapunti</string>
-  <string name="language">Lingua</string>
-  <string name="warning_backup_experimental">Attenzione: questa funzione è ancora sperimentale! Vi preghiamo di controllare ad intervalli regolari l\'effettivo salvataggio del backup!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Clicca per aggiornare le informazioni del profilo</string>
-  <string name="no_trainings">Non hai ancora registrato alcun allenamento!</string>
-  <string name="no_bows">Nessun arco</string>
-  <string name="no_arrows">Nessuna freccia</string>
-  <string name="version_info">Info versione</string>
-  <string name="version_prefix">Versione</string>
-  <string name="max_arrow_number">Numero massimo di frecce</string>
-  <string name="distances">Distanze</string>
-  <string name="diameters">Diametri</string>
-  <string name="bows">Archi</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Volée %1$d/%2$d</string>
-  <string name="round_x_of_y">Sessione %1$d/%2$d</string>
-  <string name="settings_summary_timer">ImpostaIoni aggiuntive timer</string>
-  <string name="settings_summary_scoreboard">Modifica l\'aspetto della scheda punti</string>
-  <string name="settings_summary_input">Personalizza la schermata di immissione</string>
-  <string name="settings_summary_overview">Personalizza le informazioni mostrate per allenamenti, sessioni e volée</string>
-  <string name="settings_summary_profile">Inserisci le informazioni personali</string>
-  <string name="licence_number">Numero di tesserino</string>
-  <string name="file_type">Tipo di file</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Premi per firmare</string>
-  <string name="pdf_file">File PDF</string>
-  <string name="image_file">File immagine</string>
-  <string name="settings_summary_statistics">Imposta la schermata delle statistiche</string>
-  <string name="settings_statistics_spots_to_single_target">Raggruppa punti su un\'unica targa</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opzioni</string>
+    <string name="settings">Impostazioni</string>
+    <string name="prev">Precedente</string>
+    <string name="next">Successivo</string>
+    <string name="save">Salva</string>
+    <string name="custom">Personalizzato</string>
+    <string name="training">Allenamento</string>
+    <string name="bow">Arco</string>
+    <string name="arrow">Freccia</string>
+    <string name="round">Sessione</string>
+    <string name="points">Punti</string>
+    <string name="passe">Volée</string>
+    <!-- Overview -->
+    <string name="new_training">Nuovo allenamento</string>
+    <string name="new_bow">Nuovo arco</string>
+    <string name="new_arrow">Nuova freccia</string>
+    <string name="new_round">Nuova sessione</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d allenamento selezionato</item>
+        <item quantity="other">%d allenamenti selezionati</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d arco selezionato</item>
+        <item quantity="other">%d archi selezionati</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d freccia selezionata</item>
+        <item quantity="other">%d frecce selezionate</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d volée selezionata</item>
+        <item quantity="other">%d volée selezionate</item>
+    </plurals>
+    <string name="edit">Modifica</string>
+    <string name="delete">Elimina</string>
+    <string name="statistic">Statistica</string>
+    <!-- Share -->
+    <string name="share">Condividi</string>
+    <string name="dispersion_pattern">Modello di dispersione</string>
+    <string name="sharing_failed">Condivisione fallita!</string>
+    <!-- Export -->
+    <string name="send_exported">Invia dati esportati</string>
+    <string name="exporting_failed">Esportazione fallita!</string>
+    <!-- New bow -->
+    <string name="add_bow">Aggiungi arco</string>
+    <string name="name">Nome</string>
+    <string name="bow_type">Tipo di arco</string>
+    <string name="properties">Proprietà</string>
+    <string name="brand">Marchio</string>
+    <string name="size">Misura</string>
+    <string name="description">Descrizione</string>
+    <string name="height">Altezza brace</string>
+    <string name="tiller">Asimmetria (Tiller)</string>
+    <string name="sight_settings">Impostazioni mirino</string>
+    <string name="add">Aggiungi</string>
+    <string name="take_picture">Scatta una foto</string>
+    <string name="pick_from_gallery">Seleziona un\'immagine dalla galleria</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Aggiungi freccia</string>
+    <string name="length">Lunghezza</string>
+    <string name="spine">Flessibilità (Spine)</string>
+    <string name="weight">Peso</string>
+    <string name="vanes">Alette</string>
+    <string name="nock">Cocca</string>
+    <string name="material">Materiale</string>
+    <!-- New round -->
+    <string name="title">Titolo</string>
+    <string name="outdoor">All\'aperto</string>
+    <string name="indoor">Al chiuso</string>
+    <string name="distance">Distanza</string>
+    <string name="format">Formato</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d volée</item>
+        <item quantity="other">%d volée</item>
+    </plurals>
+    <string name="with">di</string>
+    <plurals name="arrow">
+        <item quantity="one">%d freccia</item>
+        <item quantity="other">%d frecce</item>
+    </plurals>
+    <string name="target_face">Aspetto del bersaglio</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Tabella segnapunti</string>
+    <string name="arrows">Frecce</string>
+    <string name="sum">Punteggio Volée</string>
+    <string name="carry">Totale Cumulato Sessione</string>
+    <string name="action_print">Stampa</string>
+    <string name="average">Media</string>
+    <!-- Input mode -->
+    <string name="comment">Commento</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Seleziona un file</string>
+    <string name="dir_not_created">La directory non può essere creata!</string>
+    <string name="import_failed">Importazione fallita!</string>
+    <string name="file_not_found">File non trovato!</string>
+    <string name="failed_reading_file">Lettura del file fallita!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donami un hambuger</string>
+    <string name="donate_5">Donami un kebab</string>
+    <string name="donate_10">Donami una pizza farcita</string>
+    <string name="donate_20">Donami un po\' di benzina</string>
+    <string name="donation_thank">Grazie per il tuo supporto!</string>
+    <string name="donate_text" formatted="false">Gli importi sono comprensivi di IVA e 30% di commissioni Google. In alternativa si può donare sul conto PayPal dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Cronometro</string>
+    <string name="touch_to_start">Tocca per avviare</string>
+    <string name="preparation">Stai pronto</string>
+    <string name="shooting">Tiro</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Tempo di tiro</string>
+    <string name="timer_waiting_time">Tempo di preparazione</string>
+    <string name="timer_warning_time">Tempo di Preavviso</string>
+    <string name="timer_sound">Suono</string>
+    <string name="timer_vibrate">Vibra</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Importa</string>
+    <string name="exports_as_csv">Esporta in formato csv</string>
+    <string name="licences">Licenze Open Source</string>
+    <string name="licences_summary">Note legali sulle licenze</string>
+    <string name="version">Versione %s</string>
+    <plurals name="second">
+        <item quantity="one">%d secondo</item>
+        <item quantity="other">%d secondi</item>
+    </plurals>
+    <string name="info">Informazioni</string>
+    <string name="data">Dati</string>
+    <string name="weather">Meteo</string>
+    <string name="environment">Ambiente</string>
+    <string name="wind_speed">Velocità del vento</string>
+    <string name="wind_direction">Direzione del vento</string>
+    <string name="sight_setting_removed">Impostazioni mirino cancellate!</string>
+    <string name="metric">Metrico</string>
+    <string name="imperial">Imperiale</string>
+    <string name="undo">Annulla</string>
+    <string name="standard_rounds">Sessioni standard</string>
+    <string name="expand_collapse">Espandi/Comprimi</string>
+    <string name="new_round_template">Nuovo modello</string>
+    <string name="arrow_numbers">Numeri di freccia</string>
+    <string name="round_removed">Sessione cancellata!</string>
+    <string name="custom_round">Sessione personalizzata</string>
+    <string name="filter">Filtro</string>
+    <string name="club">Club</string>
+    <string name="target">Bersaglio</string>
+    <string name="standard_round">Sessione standard</string>
+    <string name="use_as_template">Usa come modello?</string>
+    <string name="create_copy">Questa è una sessione standard!\nVuoi crearne una copia per modificarla?</string>
+    <string name="practice">Pratica</string>
+    <string name="edit_training">Modifica Allenamento</string>
+    <string name="edit_standard_round">Modifica Sessione Standard</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d freccia cancellata</item>
+        <item quantity="other">%d frecce cancellate</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d arco cancellato</item>
+        <item quantity="other">%d archi cancellati</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d allenamento cancellato</item>
+        <item quantity="other">%d allenamenti cancellati</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d volée cancellata</item>
+        <item quantity="other">%d volée cancellate</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Sessione %d</item>
+        <item quantity="other">Sessione %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d sessione selezionata</item>
+        <item quantity="other">%d sessioni selezionate</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d sessione cancellata</item>
+        <item quantity="other">%d sessioni cancellate</item>
+    </plurals>
+    <string name="date">Data</string>
+    <string name="edit_round">Modifica sessione</string>
+    <string name="draw_weight">Libbraggio</string>
+    <string name="sight">Mirino</string>
+    <string name="limbs">Flettenti</string>
+    <string name="my_bow">Il mio arco</string>
+    <string name="my_arrow">La mia freccia</string>
+    <string name="tip_weight">Peso della punta</string>
+    <string name="arrow_ranking">Classifica freccia</string>
+    <string name="arrow_x_of_set_of_arrows">Freccia %1$s di %2$s</string>
+    <string name="display">Mostra</string>
+    <string name="print">Stampa</string>
+    <string name="table">Tabella</string>
+    <string name="comments">Commenti</string>
+    <string name="show_points_colored">Mostra colori dei punti</string>
+    <string name="stabilizer">Stabilizzatore</string>
+    <string name="clicker">Misuratore d\'allungo (Clicker)</string>
+    <string name="arrow_number_x">Numero della freccia %s</string>
+    <string name="training_with_standard_round">Allenamento con Sessione Standard</string>
+    <string name="free_training">Allenamento Libero</string>
+    <string name="competition">Competizione</string>
+    <string name="about">Informazioni su</string>
+    <string name="general">Generale</string>
+    <string name="contribute">Contribuisci</string>
+    <string name="connect">Collegati</string>
+    <string name="special_thanks_to">Ringraziamenti</string>
+    <string name="all_translators">Tutti coloro che hanno aiutato nella traduzione dell\'applicazione!</string>
+    <string name="all_beta_testers">Tutti coloro che si sono uniti al gruppo di beta tester e che quindi contribuiscono al miglioramento continuo dell\'applicazione.</string>
+    <string name="test_beta">Prova l\'ultima versione beta</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Condividi con gli amici</string>
+    <string name="donate">Fai una donazione</string>
+    <string name="donate_via_paypal">Dona con Paypal</string>
+    <string name="translate_crowdin">Traduci su Crowdin</string>
+    <string name="network_linkedin">Rete di LinkedIn</string>
+    <string name="search">Cerca</string>
+    <string name="us">USA</string>
+    <string name="show_shots_training">Allenamento intero</string>
+    <string name="show_shots_round">Sessione corrente</string>
+    <string name="show_shots_end">Volée corrente</string>
+    <string name="profile">Profilo</string>
+    <string name="birthday">Compleanno</string>
+    <string name="first_name">Nome</string>
+    <string name="last_name">Cognome</string>
+    <string name="age">Età</string>
+    <string name="show_signature">Firma</string>
+    <string name="archer">Arciere</string>
+    <string name="hits">A segno</string>
+    <string name="misses">Mancate</string>
+    <string name="new_end">Nuova volée</string>
+    <string name="distribution">Distribuzione</string>
+    <string name="count">Conteggio</string>
+    <string name="diameter">Diametro</string>
+    <string name="input">Inserimento</string>
+    <string name="target_zoom">Livello di zoom del bersaglio</string>
+    <string name="action_pdf">Esporta come PDF</string>
+    <string name="arrow_diameter_scale">Scala del diametro freccia</string>
+    <string name="timestamp">Data e ora</string>
+    <string name="change_target_face">Cambia aspetto del bersaglio</string>
+    <string name="your_first_training">Il tuo primo allenamento</string>
+    <string name="grouping">Raggruppamento</string>
+    <string name="show_clusters">Grappoli</string>
+    <string name="first_training_description">Tocca il + per avviare un nuovo allenamento.</string>
+    <string name="show_average">Media</string>
+    <string name="show_none">Nessuno</string>
+    <string name="left_handed">Mancino</string>
+    <string name="right_handed">Destrorso</string>
+    <string name="keyboard">Tastiera</string>
+    <string name="backup_drive_desc">Effettuare l\'archiviazione dei dati ti permette di ripristinare tutti i tuoi allenamenti qualora perdessi o cambiassi il telefono.</string>
+    <string name="backup_now">Esegui l\'archiviazione ora</string>
+    <string name="last_backup">Ultima archiviazione: %s</string>
+    <string name="recent_backups">Archiviazioni recenti</string>
+    <string name="dialog_restore_title">Torna a versione precedente</string>
+    <string name="restore_desc">Ripristinare i dati sovrascriverà tutti i dati esistenti con quelli contenuti nell\'archiviazione.</string>
+    <string name="backup_details">Dettagli archiviazione</string>
+    <string name="restore">Ripristina</string>
+    <string name="backup_location">Posizione dell\'archiviazione</string>
+    <string name="internal_storage">Archivio interno</string>
+    <string name="automatic_backup">Archiviazione automatica</string>
+    <string name="restoring">Ripristino archiviazione…</string>
+    <string name="restore_failed">Ripristino non riuscito</string>
+    <string name="delete_failed">Cancellazione fallita</string>
+    <string name="backup_restore_desc">Archiviazione e ripristino dati applicazione</string>
+    <string name="exporting">Esportazione in corso…</string>
+    <string name="loading_backups_failed">Caricamento archiviazioni fallito!</string>
+    <string name="external_storage">Archiviazione esterna</string>
+    <string name="backup_interval">Intervallo di archiviazione</string>
+    <string name="daily">Quotidiano</string>
+    <string name="weekly">Settimanale</string>
+    <string name="monthly">Mensile</string>
+    <string name="connection_failed">Connessione fallita!</string>
+    <string name="shooting_indoor">Tirare al chiuso</string>
+    <string name="bow_rest_vertical_position">Posizione verticale</string>
+    <string name="bow_rest">Poggia-freccia (Rest)</string>
+    <string name="bow_rest_horizontal_position">Posizione orizzontale</string>
+    <string name="bow_cam_settings">Impostazioni camma</string>
+    <string name="bow_letoff_weight">Scarico libbraggio</string>
+    <string name="bow_nocking_point">Posizione incocco</string>
+    <string name="bow_string">Corda</string>
+    <string name="bow_scope_magnification">Ingrandimento ottica</string>
+    <string name="bow_rest_stiffness">Rigidezza</string>
+    <string name="bow_button">Bottone</string>
+    <string name="more_fields">Più campi</string>
+    <string name="recently_used">Usati di recente</string>
+    <string name="intro_title_track_training_progress">Dimentica i segnapunti di carta!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Tutto ciò di cui hai bisogno\nin un unico posto</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Punteggio medio freccia per volée</string>
+    <string name="show_end">Mostra volée</string>
+    <string name="show_round">Mostra sessione</string>
+    <string name="show_training">Mostra allenamento</string>
+    <string name="summary">Riepilogo</string>
+    <string name="end">Volée</string>
+    <string name="average_of">Media di</string>
+    <string name="displayed_shots">Mostra tiri</string>
+    <string name="invalid_decimal_number">Numero decimale non valido</string>
+    <string name="not_within_expected_range_mm">Non compreso nell\'intervallo previsto da 1 a 20 mm</string>
+    <string name="not_within_expected_range_inch">Non compreso nell\'intervallo previsto da 0 a 1 pollice</string>
+    <string name="next_round">Sessione successiva</string>
+    <string name="previous_round">Sessione precedente</string>
+    <string name="overview">Sommario</string>
+    <string name="score">Punteggio</string>
+    <string name="show_reached_score">Mostra punteggio raggiungo</string>
+    <string name="show_total_score">Mostra punteggio totale</string>
+    <string name="show_percentage">Mostra percentuale</string>
+    <string name="show_arrow_average">Visualizza la media della freccia</string>
+    <string name="image_deleted">Immagine cancellata</string>
+    <string name="delete_image">Elimina immagine?</string>
+    <string name="keyboard_type">Tipo di tastiera</string>
+    <string name="keyboard_enabled">Tastiera attiva</string>
+    <string name="sort_shots">Ordina i tiri</string>
+    <string name="sort_shots_for_spots">Ordina i tiri per tipo di targa</string>
+    <string name="target_captain">Marcapunti</string>
+    <string name="language">Lingua</string>
+    <string name="warning_backup_experimental">Attenzione: questa funzione è ancora sperimentale! Vi preghiamo di controllare ad intervalli regolari l\'effettivo salvataggio del backup!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Clicca per aggiornare le informazioni del profilo</string>
+    <string name="no_trainings">Non hai ancora registrato alcun allenamento!</string>
+    <string name="no_bows">Nessun arco</string>
+    <string name="no_arrows">Nessuna freccia</string>
+    <string name="version_info">Info versione</string>
+    <string name="version_prefix">Versione</string>
+    <string name="max_arrow_number">Numero massimo di frecce</string>
+    <string name="distances">Distanze</string>
+    <string name="diameters">Diametri</string>
+    <string name="bows">Archi</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Volée %1$d/%2$d</string>
+    <string name="round_x_of_y">Sessione %1$d/%2$d</string>
+    <string name="settings_summary_timer">ImpostaIoni aggiuntive timer</string>
+    <string name="settings_summary_scoreboard">Modifica l\'aspetto della scheda punti</string>
+    <string name="settings_summary_input">Personalizza la schermata di immissione</string>
+    <string name="settings_summary_overview">Personalizza le informazioni mostrate per allenamenti, sessioni e volée</string>
+    <string name="settings_summary_profile">Inserisci le informazioni personali</string>
+    <string name="licence_number">Numero di tesserino</string>
+    <string name="file_type">Tipo di file</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Premi per firmare</string>
+    <string name="pdf_file">File PDF</string>
+    <string name="image_file">File immagine</string>
+    <string name="settings_summary_statistics">Imposta la schermata delle statistiche</string>
+    <string name="settings_statistics_spots_to_single_target">Raggruppa punti su un\'unica targa</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 16859bd7d..61cb141de 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">אפשרויות</string>
-  <string name="settings">Settings</string>
-  <string name="prev">הקודם</string>
-  <string name="next">הבא</string>
-  <string name="save">שמור</string>
-  <string name="custom">התאמה אישית</string>
-  <string name="training">הדרכה</string>
-  <string name="bow">קשת</string>
-  <string name="arrow">חץ</string>
-  <string name="round">סבב</string>
-  <string name="points">נקודות</string>
-  <string name="passe">פסה</string>
-  <!-- Overview -->
-  <string name="new_training">אימון חדש</string>
-  <string name="new_bow">קשת חדשה</string>
-  <string name="new_arrow">חץ חדש</string>
-  <string name="new_round">סבב חדש</string>
-  <plurals name="training_selected">
-    <item quantity="one">נבחר אימון אחד</item>
-    <item quantity="two">נבחרו %d אימונים</item>
-    <item quantity="many">נבחרו %d אימונים</item>
-    <item quantity="other">נבחרו %d אימונים</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">נבחרה קשת אחת</item>
-    <item quantity="two">נבחרו %d קשתות</item>
-    <item quantity="many">נבחרו %d קשתות</item>
-    <item quantity="other">נבחרו %d קשתות</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">נבחר חץ אחד</item>
-    <item quantity="two">נבחרו %d חצים</item>
-    <item quantity="many">נבחרו %d חצים</item>
-    <item quantity="other">נבחרו %d חצים</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="two">%d ends selected</item>
-    <item quantity="many">%d ends selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">ערוך</string>
-  <string name="delete">מחק</string>
-  <string name="statistic">סטטיסטיקה</string>
-  <!-- Share -->
-  <string name="share">שתף</string>
-  <string name="dispersion_pattern">דפוס הפיזור</string>
-  <string name="sharing_failed">שיתוף נכשל!</string>
-  <!-- Export -->
-  <string name="send_exported">שלח נתונים מיוצאים</string>
-  <string name="exporting_failed">ייצוא נכשל!</string>
-  <!-- New bow -->
-  <string name="add_bow">הוסף קשת</string>
-  <string name="name">שם</string>
-  <string name="bow_type">סוג הקשת</string>
-  <string name="properties">מאפיינים</string>
-  <string name="brand">מותג</string>
-  <string name="size">גודל</string>
-  <string name="description">תיאור</string>
-  <string name="height">גובה הקורה</string>
-  <string name="tiller">מרווח</string>
-  <string name="sight_settings">הגדרות כוונת</string>
-  <string name="add">הוסף</string>
-  <string name="take_picture">צלם</string>
-  <string name="pick_from_gallery">בחר תמונה מהגלריה</string>
-  <!-- New arrow -->
-  <string name="add_arrow">הוסף חץ</string>
-  <string name="length">אורך</string>
-  <string name="spine">גמישות</string>
-  <string name="weight">משקל</string>
-  <string name="vanes">נוצות</string>
-  <string name="nock">זנב חץ</string>
-  <string name="material">חומר גלם</string>
-  <!-- New round -->
-  <string name="title">כותרת</string>
-  <string name="outdoor">חוץ</string>
-  <string name="indoor">פנים</string>
-  <string name="distance">מרחק</string>
-  <string name="format">פורמט</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">מקצה %d</item>
-    <item quantity="two">מקצה %d</item>
-    <item quantity="many">מקצה %d</item>
-    <item quantity="other">מקצה %d</item>
-  </plurals>
-  <string name="with">של</string>
-  <plurals name="arrow">
-    <item quantity="one">חץ %d</item>
-    <item quantity="two">%d חצים</item>
-    <item quantity="many">%d חצים</item>
-    <item quantity="other">%d חצים</item>
-  </plurals>
-  <string name="target_face">פני המטרה</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">לוח תוצאות</string>
-  <string name="arrows">חצים</string>
-  <string name="sum">ניקוד</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">הדפס</string>
-  <string name="average">ממוצע</string>
-  <!-- Input mode -->
-  <string name="comment">הערה</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">בחר קובץ</string>
-  <string name="dir_not_created">לא ניתן היה ליצור מדריך!</string>
-  <string name="import_failed">ייבוא נכשל!</string>
-  <string name="file_not_found">קובץ לא נמצא!</string>
-  <string name="failed_reading_file">קריאת הקובץ נכשלה!</string>
-  <!-- Donate -->
-  <string name="donate_2">תרום לי המבורגר</string>
-  <string name="donate_5">תרום לי קבב</string>
-  <string name="donate_10">רום לי מגש פיצה גדול</string>
-  <string name="donate_20">תרום לי קצת דלק</string>
-  <string name="donation_thank">תודה לך על תמיכתך!</string>
-  <string name="donate_text" formatted="false">המחירים כוללים מע\"מ ומס בשווי 30% לגוגל. לחילופין, נשמח אם תוכל לתרום לחשבון ה-PayPal של dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">טיימר</string>
-  <string name="touch_to_start">גע כדי להתחיל</string>
-  <string name="preparation">התכונן</string>
-  <string name="shooting">ירי</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">זמן ירי</string>
-  <string name="timer_waiting_time">הכן זמן</string>
-  <string name="timer_warning_time">זמן אזהרה</string>
-  <string name="timer_sound">שמע</string>
-  <string name="timer_vibrate">רטט</string>
-  <!-- Settings -->
-  <string name="backup_action">גיבוי</string>
-  <string name="import_action">יבא</string>
-  <string name="exports_as_csv">ייצא כקובץ csv</string>
-  <string name="licences">קוד רשיון פתוח</string>
-  <string name="licences_summary">הערות משפטיות לרישיונות</string>
-  <string name="version">גירסה %s</string>
-  <plurals name="second">
-    <item quantity="one">%d שנייה</item>
-    <item quantity="two">%d שניות</item>
-    <item quantity="many">%d שניות</item>
-    <item quantity="other">%d שניות</item>
-  </plurals>
-  <string name="info">מידע</string>
-  <string name="data">מידע</string>
-  <string name="weather">מזג אוויר</string>
-  <string name="environment">סביבה</string>
-  <string name="wind_speed">מהירות הרוח</string>
-  <string name="wind_direction">כיוון הרוח</string>
-  <string name="sight_setting_removed">הגדרת הכוונת נמחקה!</string>
-  <string name="metric">מטרי</string>
-  <string name="imperial">אימפריאלי</string>
-  <string name="undo">בטל</string>
-  <string name="standard_rounds">סבבים סטנדרטיים</string>
-  <string name="expand_collapse">הרחב/כווץ</string>
-  <string name="new_round_template">תבנית חדשה</string>
-  <string name="arrow_numbers">מספרי חצים</string>
-  <string name="round_removed">סבב נמחק!</string>
-  <string name="custom_round">סבב מותאם אישית</string>
-  <string name="filter">סינון</string>
-  <string name="club">מועדון</string>
-  <string name="target">מטרה</string>
-  <string name="standard_round">סבב סטנדרטי</string>
-  <string name="use_as_template">להשתמש כתבנית?</string>
-  <string name="create_copy">זהו סבב סטנדרטי! האם ברצונך ליצור עותק בכדי לערוך אותו?</string>
-  <string name="practice">תרגול</string>
-  <string name="edit_training">ערוך אימון</string>
-  <string name="edit_standard_round">ערוך סבב סטנדרטי</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">חצים נמחקו</item>
-    <item quantity="two">חצים נמחקו</item>
-    <item quantity="many">חצים נמחקו</item>
-    <item quantity="other">חצים נמחקו</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">קשת נמחקה</item>
-    <item quantity="two">קשת נמחקה</item>
-    <item quantity="many">קשת נמחקה</item>
-    <item quantity="other">קשת נמחקה</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">אימון נמחק</item>
-    <item quantity="two">אימון נמחק</item>
-    <item quantity="many">אימון נמחק</item>
-    <item quantity="other">אימון נמחק</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">מקצה נמחק</item>
-    <item quantity="two">מקצה נמחק</item>
-    <item quantity="many">מקצה נמחק</item>
-    <item quantity="other">מקצה נמחק</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">סבב</item>
-    <item quantity="two">סבב</item>
-    <item quantity="many">סבב</item>
-    <item quantity="other">סבב</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">נבחרו %d סבבים</item>
-    <item quantity="two">נבחרו %d סבבים</item>
-    <item quantity="many">נבחרו %d סבבים</item>
-    <item quantity="other">נבחרו %d סבבים</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">נמחקו %d סבבים</item>
-    <item quantity="two">נמחקו %d סבבים</item>
-    <item quantity="many">נמחקו %d סבבים</item>
-    <item quantity="other">נמחקו %d סבבים</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">פגיעות</string>
-  <string name="misses">החטאות</string>
-  <string name="new_end">מקצה חדש</string>
-  <string name="distribution">הפצה</string>
-  <string name="count">ספירה</string>
-  <string name="diameter">קוטר</string>
-  <string name="input">קלט</string>
-  <string name="target_zoom">רמת התמקדות במטרה</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">קנה מידה של קוטר החץ</string>
-  <string name="timestamp">זמן</string>
-  <string name="change_target_face">שנה את חזית המטרה</string>
-  <string name="your_first_training">האימון הראשון שלך</string>
-  <string name="grouping">מקבץ</string>
-  <string name="show_clusters">אגדים</string>
-  <string name="first_training_description">לחץ על הפלוס בכדי להתחיל אימון חדש.</string>
-  <string name="show_average">ממוצע</string>
-  <string name="show_none">ללא</string>
-  <string name="left_handed">שמאלי</string>
-  <string name="right_handed">ימני</string>
-  <string name="keyboard">מקלדת</string>
-  <string name="backup_drive_desc">גיבוי הנתונים שלך מאפשר לך לשחזר את כל האימונים שלך במקרה של אובדן או החלפת המכשיר הסלולארי.</string>
-  <string name="backup_now">גבה עכשיו</string>
-  <string name="last_backup">גיבוי אחרון: %s</string>
-  <string name="recent_backups">גיבויים אחרונים</string>
-  <string name="dialog_restore_title">חזור לגרסא קודמת</string>
-  <string name="restore_desc">שחזור הנתונים ישכתב את כל הנתונים הקיימים באמצעות הגיבוי.</string>
-  <string name="backup_details">פרטי גיבוי</string>
-  <string name="restore">שחזר</string>
-  <string name="backup_location">מיקום הגיבוי</string>
-  <string name="internal_storage">אחסון פנימי</string>
-  <string name="automatic_backup">גיבוי אוטומטי</string>
-  <string name="restoring">משחזר גיבוי…</string>
-  <string name="restore_failed">שחזור נכשל</string>
-  <string name="delete_failed">מחיקה נכשלה</string>
-  <string name="backup_restore_desc">גבה ושחזר נתוני אפליקציה</string>
-  <string name="exporting">מייצא…</string>
-  <string name="loading_backups_failed">טעינת גיבויים נכשלה!</string>
-  <string name="external_storage">אחסון חיצוני</string>
-  <string name="backup_interval">מרווח זמן הגיבוי</string>
-  <string name="daily">אחת ליום</string>
-  <string name="weekly">אחת לשבוע</string>
-  <string name="monthly">אחת לחודש</string>
-  <string name="connection_failed">החיבור נכשל!</string>
-  <string name="shooting_indoor">ירי מקורה</string>
-  <string name="bow_rest_vertical_position">מיקום אנכי</string>
-  <string name="bow_rest">תומך חץ</string>
-  <string name="bow_rest_horizontal_position">מיקום אופקי</string>
-  <string name="bow_cam_settings">הגדרות מצלמה</string>
-  <string name="bow_letoff_weight">משקל רפוי</string>
-  <string name="bow_nocking_point">נקודות לחיצה</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">אפשרויות</string>
+    <string name="settings">Settings</string>
+    <string name="prev">הקודם</string>
+    <string name="next">הבא</string>
+    <string name="save">שמור</string>
+    <string name="custom">התאמה אישית</string>
+    <string name="training">הדרכה</string>
+    <string name="bow">קשת</string>
+    <string name="arrow">חץ</string>
+    <string name="round">סבב</string>
+    <string name="points">נקודות</string>
+    <string name="passe">פסה</string>
+    <!-- Overview -->
+    <string name="new_training">אימון חדש</string>
+    <string name="new_bow">קשת חדשה</string>
+    <string name="new_arrow">חץ חדש</string>
+    <string name="new_round">סבב חדש</string>
+    <plurals name="training_selected">
+        <item quantity="one">נבחר אימון אחד</item>
+        <item quantity="two">נבחרו %d אימונים</item>
+        <item quantity="many">נבחרו %d אימונים</item>
+        <item quantity="other">נבחרו %d אימונים</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">נבחרה קשת אחת</item>
+        <item quantity="two">נבחרו %d קשתות</item>
+        <item quantity="many">נבחרו %d קשתות</item>
+        <item quantity="other">נבחרו %d קשתות</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">נבחר חץ אחד</item>
+        <item quantity="two">נבחרו %d חצים</item>
+        <item quantity="many">נבחרו %d חצים</item>
+        <item quantity="other">נבחרו %d חצים</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="two">%d ends selected</item>
+        <item quantity="many">%d ends selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">ערוך</string>
+    <string name="delete">מחק</string>
+    <string name="statistic">סטטיסטיקה</string>
+    <!-- Share -->
+    <string name="share">שתף</string>
+    <string name="dispersion_pattern">דפוס הפיזור</string>
+    <string name="sharing_failed">שיתוף נכשל!</string>
+    <!-- Export -->
+    <string name="send_exported">שלח נתונים מיוצאים</string>
+    <string name="exporting_failed">ייצוא נכשל!</string>
+    <!-- New bow -->
+    <string name="add_bow">הוסף קשת</string>
+    <string name="name">שם</string>
+    <string name="bow_type">סוג הקשת</string>
+    <string name="properties">מאפיינים</string>
+    <string name="brand">מותג</string>
+    <string name="size">גודל</string>
+    <string name="description">תיאור</string>
+    <string name="height">גובה הקורה</string>
+    <string name="tiller">מרווח</string>
+    <string name="sight_settings">הגדרות כוונת</string>
+    <string name="add">הוסף</string>
+    <string name="take_picture">צלם</string>
+    <string name="pick_from_gallery">בחר תמונה מהגלריה</string>
+    <!-- New arrow -->
+    <string name="add_arrow">הוסף חץ</string>
+    <string name="length">אורך</string>
+    <string name="spine">גמישות</string>
+    <string name="weight">משקל</string>
+    <string name="vanes">נוצות</string>
+    <string name="nock">זנב חץ</string>
+    <string name="material">חומר גלם</string>
+    <!-- New round -->
+    <string name="title">כותרת</string>
+    <string name="outdoor">חוץ</string>
+    <string name="indoor">פנים</string>
+    <string name="distance">מרחק</string>
+    <string name="format">פורמט</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">מקצה %d</item>
+        <item quantity="two">מקצה %d</item>
+        <item quantity="many">מקצה %d</item>
+        <item quantity="other">מקצה %d</item>
+    </plurals>
+    <string name="with">של</string>
+    <plurals name="arrow">
+        <item quantity="one">חץ %d</item>
+        <item quantity="two">%d חצים</item>
+        <item quantity="many">%d חצים</item>
+        <item quantity="other">%d חצים</item>
+    </plurals>
+    <string name="target_face">פני המטרה</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">לוח תוצאות</string>
+    <string name="arrows">חצים</string>
+    <string name="sum">ניקוד</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">הדפס</string>
+    <string name="average">ממוצע</string>
+    <!-- Input mode -->
+    <string name="comment">הערה</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">בחר קובץ</string>
+    <string name="dir_not_created">לא ניתן היה ליצור מדריך!</string>
+    <string name="import_failed">ייבוא נכשל!</string>
+    <string name="file_not_found">קובץ לא נמצא!</string>
+    <string name="failed_reading_file">קריאת הקובץ נכשלה!</string>
+    <!-- Donate -->
+    <string name="donate_2">תרום לי המבורגר</string>
+    <string name="donate_5">תרום לי קבב</string>
+    <string name="donate_10">רום לי מגש פיצה גדול</string>
+    <string name="donate_20">תרום לי קצת דלק</string>
+    <string name="donation_thank">תודה לך על תמיכתך!</string>
+    <string name="donate_text" formatted="false">המחירים כוללים מע\"מ ומס בשווי 30% לגוגל. לחילופין, נשמח אם תוכל לתרום לחשבון ה-PayPal של dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">טיימר</string>
+    <string name="touch_to_start">גע כדי להתחיל</string>
+    <string name="preparation">התכונן</string>
+    <string name="shooting">ירי</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">זמן ירי</string>
+    <string name="timer_waiting_time">הכן זמן</string>
+    <string name="timer_warning_time">זמן אזהרה</string>
+    <string name="timer_sound">שמע</string>
+    <string name="timer_vibrate">רטט</string>
+    <!-- Settings -->
+    <string name="backup_action">גיבוי</string>
+    <string name="import_action">יבא</string>
+    <string name="exports_as_csv">ייצא כקובץ csv</string>
+    <string name="licences">קוד רשיון פתוח</string>
+    <string name="licences_summary">הערות משפטיות לרישיונות</string>
+    <string name="version">גירסה %s</string>
+    <plurals name="second">
+        <item quantity="one">%d שנייה</item>
+        <item quantity="two">%d שניות</item>
+        <item quantity="many">%d שניות</item>
+        <item quantity="other">%d שניות</item>
+    </plurals>
+    <string name="info">מידע</string>
+    <string name="data">מידע</string>
+    <string name="weather">מזג אוויר</string>
+    <string name="environment">סביבה</string>
+    <string name="wind_speed">מהירות הרוח</string>
+    <string name="wind_direction">כיוון הרוח</string>
+    <string name="sight_setting_removed">הגדרת הכוונת נמחקה!</string>
+    <string name="metric">מטרי</string>
+    <string name="imperial">אימפריאלי</string>
+    <string name="undo">בטל</string>
+    <string name="standard_rounds">סבבים סטנדרטיים</string>
+    <string name="expand_collapse">הרחב/כווץ</string>
+    <string name="new_round_template">תבנית חדשה</string>
+    <string name="arrow_numbers">מספרי חצים</string>
+    <string name="round_removed">סבב נמחק!</string>
+    <string name="custom_round">סבב מותאם אישית</string>
+    <string name="filter">סינון</string>
+    <string name="club">מועדון</string>
+    <string name="target">מטרה</string>
+    <string name="standard_round">סבב סטנדרטי</string>
+    <string name="use_as_template">להשתמש כתבנית?</string>
+    <string name="create_copy">זהו סבב סטנדרטי! האם ברצונך ליצור עותק בכדי לערוך אותו?</string>
+    <string name="practice">תרגול</string>
+    <string name="edit_training">ערוך אימון</string>
+    <string name="edit_standard_round">ערוך סבב סטנדרטי</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">חצים נמחקו</item>
+        <item quantity="two">חצים נמחקו</item>
+        <item quantity="many">חצים נמחקו</item>
+        <item quantity="other">חצים נמחקו</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">קשת נמחקה</item>
+        <item quantity="two">קשת נמחקה</item>
+        <item quantity="many">קשת נמחקה</item>
+        <item quantity="other">קשת נמחקה</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">אימון נמחק</item>
+        <item quantity="two">אימון נמחק</item>
+        <item quantity="many">אימון נמחק</item>
+        <item quantity="other">אימון נמחק</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">מקצה נמחק</item>
+        <item quantity="two">מקצה נמחק</item>
+        <item quantity="many">מקצה נמחק</item>
+        <item quantity="other">מקצה נמחק</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">סבב</item>
+        <item quantity="two">סבב</item>
+        <item quantity="many">סבב</item>
+        <item quantity="other">סבב</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">נבחרו %d סבבים</item>
+        <item quantity="two">נבחרו %d סבבים</item>
+        <item quantity="many">נבחרו %d סבבים</item>
+        <item quantity="other">נבחרו %d סבבים</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">נמחקו %d סבבים</item>
+        <item quantity="two">נמחקו %d סבבים</item>
+        <item quantity="many">נמחקו %d סבבים</item>
+        <item quantity="other">נמחקו %d סבבים</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">פגיעות</string>
+    <string name="misses">החטאות</string>
+    <string name="new_end">מקצה חדש</string>
+    <string name="distribution">הפצה</string>
+    <string name="count">ספירה</string>
+    <string name="diameter">קוטר</string>
+    <string name="input">קלט</string>
+    <string name="target_zoom">רמת התמקדות במטרה</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">קנה מידה של קוטר החץ</string>
+    <string name="timestamp">זמן</string>
+    <string name="change_target_face">שנה את חזית המטרה</string>
+    <string name="your_first_training">האימון הראשון שלך</string>
+    <string name="grouping">מקבץ</string>
+    <string name="show_clusters">אגדים</string>
+    <string name="first_training_description">לחץ על הפלוס בכדי להתחיל אימון חדש.</string>
+    <string name="show_average">ממוצע</string>
+    <string name="show_none">ללא</string>
+    <string name="left_handed">שמאלי</string>
+    <string name="right_handed">ימני</string>
+    <string name="keyboard">מקלדת</string>
+    <string name="backup_drive_desc">גיבוי הנתונים שלך מאפשר לך לשחזר את כל האימונים שלך במקרה של אובדן או החלפת המכשיר הסלולארי.</string>
+    <string name="backup_now">גבה עכשיו</string>
+    <string name="last_backup">גיבוי אחרון: %s</string>
+    <string name="recent_backups">גיבויים אחרונים</string>
+    <string name="dialog_restore_title">חזור לגרסא קודמת</string>
+    <string name="restore_desc">שחזור הנתונים ישכתב את כל הנתונים הקיימים באמצעות הגיבוי.</string>
+    <string name="backup_details">פרטי גיבוי</string>
+    <string name="restore">שחזר</string>
+    <string name="backup_location">מיקום הגיבוי</string>
+    <string name="internal_storage">אחסון פנימי</string>
+    <string name="automatic_backup">גיבוי אוטומטי</string>
+    <string name="restoring">משחזר גיבוי…</string>
+    <string name="restore_failed">שחזור נכשל</string>
+    <string name="delete_failed">מחיקה נכשלה</string>
+    <string name="backup_restore_desc">גבה ושחזר נתוני אפליקציה</string>
+    <string name="exporting">מייצא…</string>
+    <string name="loading_backups_failed">טעינת גיבויים נכשלה!</string>
+    <string name="external_storage">אחסון חיצוני</string>
+    <string name="backup_interval">מרווח זמן הגיבוי</string>
+    <string name="daily">אחת ליום</string>
+    <string name="weekly">אחת לשבוע</string>
+    <string name="monthly">אחת לחודש</string>
+    <string name="connection_failed">החיבור נכשל!</string>
+    <string name="shooting_indoor">ירי מקורה</string>
+    <string name="bow_rest_vertical_position">מיקום אנכי</string>
+    <string name="bow_rest">תומך חץ</string>
+    <string name="bow_rest_horizontal_position">מיקום אופקי</string>
+    <string name="bow_cam_settings">הגדרות מצלמה</string>
+    <string name="bow_letoff_weight">משקל רפוי</string>
+    <string name="bow_nocking_point">נקודות לחיצה</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4e1d49ba1..2c4cf2554 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">設定</string>
-  <string name="settings">Settings</string>
-  <string name="prev">前へ</string>
-  <string name="next">次へ</string>
-  <string name="save">保存</string>
-  <string name="custom">カスタム</string>
-  <string name="training">トレーニング</string>
-  <string name="bow">ボウ</string>
-  <string name="arrow">矢</string>
-  <string name="round">ラウンド</string>
-  <string name="points">ポイント</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">エクスポートされたデータを送信します。</string>
-  <string name="exporting_failed">エクスポートに失敗しました。</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">ボウのタイプ</string>
-  <string name="properties">プロパティ</string>
-  <string name="brand">メーカー:</string>
-  <string name="size">サイズ</string>
-  <string name="description">説明</string>
-  <string name="height">ブレースハイト</string>
-  <string name="tiller">ティラー</string>
-  <string name="sight_settings">サイトの設定</string>
-  <string name="add">追加</string>
-  <string name="take_picture">写真を撮る</string>
-  <string name="pick_from_gallery">画像を選択します。</string>
-  <!-- New arrow -->
-  <string name="add_arrow">アローを追加します。</string>
-  <string name="length">長さ</string>
-  <string name="spine">Spine</string>
-  <string name="weight">ウェイト</string>
-  <string name="vanes">矢羽</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">設定</string>
+    <string name="settings">Settings</string>
+    <string name="prev">前へ</string>
+    <string name="next">次へ</string>
+    <string name="save">保存</string>
+    <string name="custom">カスタム</string>
+    <string name="training">トレーニング</string>
+    <string name="bow">ボウ</string>
+    <string name="arrow">矢</string>
+    <string name="round">ラウンド</string>
+    <string name="points">ポイント</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Share</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">エクスポートされたデータを送信します。</string>
+    <string name="exporting_failed">エクスポートに失敗しました。</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Name</string>
+    <string name="bow_type">ボウのタイプ</string>
+    <string name="properties">プロパティ</string>
+    <string name="brand">メーカー:</string>
+    <string name="size">サイズ</string>
+    <string name="description">説明</string>
+    <string name="height">ブレースハイト</string>
+    <string name="tiller">ティラー</string>
+    <string name="sight_settings">サイトの設定</string>
+    <string name="add">追加</string>
+    <string name="take_picture">写真を撮る</string>
+    <string name="pick_from_gallery">画像を選択します。</string>
+    <!-- New arrow -->
+    <string name="add_arrow">アローを追加します。</string>
+    <string name="length">長さ</string>
+    <string name="spine">Spine</string>
+    <string name="weight">ウェイト</string>
+    <string name="vanes">矢羽</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Arrows</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Print</string>
+    <string name="average">Average</string>
+    <!-- Input mode -->
+    <string name="comment">Comment</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Select a file</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 078d10699..3285a9130 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">설정</string>
+    <string name="settings">설정</string>
+    <string name="prev">이전</string>
+    <string name="next">다음</string>
+    <string name="save">저장</string>
+    <string name="custom">사용자 지정</string>
+    <string name="training">연습 훈련</string>
+    <string name="bow">활</string>
+    <string name="arrow">화살</string>
+    <string name="round">라운드</string>
+    <string name="points">포인트:</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">새로운 훈련</string>
+    <string name="new_bow">새로운 활</string>
+    <string name="new_arrow">새로운 화살</string>
+    <string name="new_round">새로운 라운드</string>
+    <plurals name="training_selected">
+        <item quantity="other">훈련 선택</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">활(bow) 선택</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">화살 선택</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">End 선택</item>
+    </plurals>
+    <string name="edit">수정하기</string>
+    <string name="delete">삭제하시겠습니까?</string>
+    <string name="statistic">통계</string>
+    <!-- Share -->
+    <string name="share">공유하기</string>
+    <string name="dispersion_pattern">분산 패턴</string>
+    <string name="sharing_failed">공유에 실패했습니다</string>
+    <!-- Export -->
+    <string name="send_exported">데이터 전송</string>
+    <string name="exporting_failed">전송 실패!</string>
+    <!-- New bow -->
+    <string name="add_bow">활(bow) 추가하기</string>
+    <string name="name">이름</string>
+    <string name="bow_type">활(bow) 종류</string>
+    <string name="properties">환경설정</string>
+    <string name="brand">브랜드명</string>
+    <string name="size">Size</string>
+    <string name="description">상세정보</string>
+    <string name="height">Brace height(현과 핸들과의 거리)</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">조준기 설정</string>
+    <string name="add">추가하기</string>
+    <string name="take_picture">사진 촬영</string>
+    <string name="pick_from_gallery">갤러리에서 사진 선택</string>
+    <!-- New arrow -->
+    <string name="add_arrow">화살 추가</string>
+    <string name="length">길이</string>
+    <string name="spine">Spine(화살대)</string>
+    <string name="weight">무게</string>
+    <string name="vanes">화살 깃</string>
+    <string name="nock">노크</string>
+    <string name="material">재질</string>
+    <!-- New round -->
+    <string name="title">타이틀</string>
+    <string name="outdoor">실외</string>
+    <string name="indoor">실내</string>
+    <string name="distance">거리</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d end</item>
+    </plurals>
+    <string name="with">의</string>
+    <plurals name="arrow">
+        <item quantity="other">%d 화살</item>
+    </plurals>
+    <string name="target_face">타겟 종류</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">점수판</string>
+    <string name="arrows">화살</string>
+    <string name="sum">점수</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">인쇄하기</string>
+    <string name="average">평균</string>
+    <!-- Input mode -->
+    <string name="comment">의견</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">파일 선택하기</string>
+    <string name="dir_not_created">디렉터리를 만들 수 없습니다!</string>
+    <string name="import_failed">가져오기 실패!</string>
+    <string name="file_not_found">파일을 찾을 수 없습니다!</string>
+    <string name="failed_reading_file">파일 읽기 실패!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">필터</string>
+    <string name="club">클럽</string>
+    <string name="target">타겟 </string>
+    <string name="standard_round">표준 라운드</string>
+    <string name="use_as_template">템플릿으로 사용할까요</string>
+    <string name="create_copy">이것은 표준 라운드 입니다!\n 편집 하려면 복사본을 생성 하시겠습니까?</string>
+    <string name="practice">연습</string>
+    <string name="edit_training">트레이닝 편집</string>
+    <string name="edit_standard_round">표준 라운드 편집</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d 화살 삭제</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d 활(bow) 삭제</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d 훈련삭제</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d End 삭제</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">라운드 %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d 라운드 선택</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">라운드 삭제</item>
+    </plurals>
+    <string name="date">날짜</string>
+    <string name="edit_round">라운드 편집</string>
+    <string name="draw_weight">Draw weight(활 강도)</string>
+    <string name="sight">조준기</string>
+    <string name="limbs">림 날개</string>
+    <string name="my_bow">나의 활</string>
+    <string name="my_arrow">나의 화살</string>
+    <string name="tip_weight">팁 무게</string>
+    <string name="arrow_ranking">화살 순위</string>
+    <string name="arrow_x_of_set_of_arrows">화살표 %2$s 의 %1$s</string>
+    <string name="display">표시방식</string>
+    <string name="print">인쇄하기</string>
+    <string name="table">순위표</string>
+    <string name="comments">댓글</string>
+    <string name="show_points_colored">포인트 컬러를 표시합니다</string>
+    <string name="stabilizer">스태빌라이저</string>
+    <string name="clicker">클릭커</string>
+    <string name="arrow_number_x">화살 갯수 %s</string>
+    <string name="training_with_standard_round">표준 라운드 훈련</string>
+    <string name="free_training">자유 훈련</string>
+    <string name="competition">대회</string>
+    <string name="about">에 대한</string>
+    <string name="general">기본설정</string>
+    <string name="contribute">구매하기</string>
+    <string name="connect">연동하기</string>
+    <string name="special_thanks_to">도움 주신 분</string>
+    <string name="all_translators">앱 번역 하는 데 도움 주신분!</string>
+    <string name="all_beta_testers">베타 테스터 그룹 및 앱을 지속적으로 개선 하는 데 도움이 되신 모든 분들</string>
+    <string name="test_beta">최신 베타 버전 테스트</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">친구와 공유하기</string>
+    <string name="donate">후원하기</string>
+    <string name="donate_via_paypal">페이팔로 기부하기</string>
+    <string name="translate_crowdin">Crowdin에서 번역</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">PDF 로 내보내기</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">백업 복원 실패!</string>
+    <string name="external_storage">외부 저장소</string>
+    <string name="backup_interval">백업 간격</string>
+    <string name="daily">일간</string>
+    <string name="weekly">주간</string>
+    <string name="monthly">월간</string>
+    <string name="connection_failed">연결 실패!</string>
+    <string name="shooting_indoor">실내 훈련</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">rest</string>
+    <string name="bow_rest_horizontal_position">수평 위치</string>
+    <string name="bow_cam_settings">Cam 설정</string>
+    <string name="bow_letoff_weight">Letoff 무게</string>
+    <string name="bow_nocking_point">Nocking 위치</string>
+    <string name="bow_string">String 현</string>
+    <string name="bow_scope_magnification">화면 확대</string>
+    <string name="bow_rest_stiffness">경도</string>
+    <string name="bow_button">버튼</string>
+    <string name="more_fields">입력란 더보기</string>
+    <string name="recently_used">최근 사용한 것</string>
+    <string name="intro_title_track_training_progress">종이 점수표는 잊어버려라!</string>
+    <string name="intro_description_track_training_progress">정확한 화살과 함께 하고,\n훈련 데이터에서 더 유용하게 활용할수 있습니다.</string>
+    <string name="intro_title_everything_in_one_place">당신이 필요한 모든것</string>
+    <string name="intro_description_everything_in_one_place">활-화살-\n와 표적체크 관리,\n양궁 타이머, 통계 \n, 모를 포함 하여</string>
+    <string name="average_arrow_score_per_end">End 당 점수</string>
+    <string name="show_end">End 보여주기</string>
+    <string name="show_round">라운드 보기</string>
+    <string name="show_training">훈련 보기</string>
+    <string name="summary">요약</string>
+    <string name="end">End</string>
+    <string name="average_of">평균 /</string>
+    <string name="displayed_shots">샷 표시</string>
+    <string name="invalid_decimal_number">유효하지 않은 번호</string>
+    <string name="not_within_expected_range_mm">1 ~ 20 mm의 예상 범위 안</string>
+    <string name="not_within_expected_range_inch">0 ~ 1 인치의 예상 범위 안</string>
+    <string name="next_round">다음 라운드</string>
+    <string name="previous_round">이전 라운드</string>
+    <string name="overview">개요</string>
+    <string name="score">점수</string>
+    <string name="show_reached_score">최고점수 보기</string>
+    <string name="show_total_score">총 점수 보기</string>
+    <string name="show_percentage">퍼센트 보기</string>
+    <string name="show_arrow_average">평균점수 보기</string>
+    <string name="image_deleted">이미지 삭제</string>
+    <string name="delete_image">이미지를 삭제하시겠어요?</string>
+    <string name="keyboard_type">키보드 종류</string>
+    <string name="keyboard_enabled">키보드 사용</string>
+    <string name="sort_shots">샷 정렬</string>
+    <string name="sort_shots_for_spots">타겟 면에 대한 샷 정렬</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">언어</string>
+    <string name="warning_backup_experimental">경고:이 기능은 아직 시험중 입니다! 성공적인 백업을 위해 정기적으로 확인 하시기 바랍니다!</string>
+    <string name="drawer_open">메뉴 열기</string>
+    <string name="drawer_close">메뉴 닫기</string>
+    <string name="help">도움말</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">프로필 정보를 입력 하려면 클릭 하십시오</string>
+    <string name="no_trainings">아직 훈련내용이 없습니다.</string>
+    <string name="no_bows">입력된 활이 없음</string>
+    <string name="no_arrows">입력된 화살이 없음</string>
+    <string name="version_info">버전 정보</string>
+    <string name="version_prefix">버전</string>
+    <string name="max_arrow_number">최대 화살갯수</string>
+    <string name="distances">거리</string>
+    <string name="diameters">직경</string>
+    <string name="bows">활</string>
+    <string name="reset">초기화</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bd988c18c..4d12e0adf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opties</string>
-  <string name="settings">Instellingen</string>
-  <string name="prev">Vorige</string>
-  <string name="next">Volgende</string>
-  <string name="save">Opslaan</string>
-  <string name="custom">Aangepast</string>
-  <string name="training">Training</string>
-  <string name="bow">Boog</string>
-  <string name="arrow">Pijl</string>
-  <string name="round">Ronde</string>
-  <string name="points">Punten</string>
-  <string name="passe">Beurt</string>
-  <!-- Overview -->
-  <string name="new_training">Nieuwe training</string>
-  <string name="new_bow">Nieuwe boog</string>
-  <string name="new_arrow">Nieuwe pijl</string>
-  <string name="new_round">Nieuwe ronde</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training geselecteerd</item>
-    <item quantity="other">%d trainingen geselecteerd</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d boog geselecteerd</item>
-    <item quantity="other">%d bogen geselecteerd</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d pijl geselecteerd</item>
-    <item quantity="other">%d pijlen geselecteerd</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d beurt geselecteerd</item>
-    <item quantity="other">%d beurten geselecteerd</item>
-  </plurals>
-  <string name="edit">Wijzigen</string>
-  <string name="delete">Verwijderen</string>
-  <string name="statistic">Statistiek</string>
-  <!-- Share -->
-  <string name="share">Delen</string>
-  <string name="dispersion_pattern">Verspreidingspatroon</string>
-  <string name="sharing_failed">Delen mislukt!</string>
-  <!-- Export -->
-  <string name="send_exported">Geëxporteerde data versturen</string>
-  <string name="exporting_failed">Exporteren mislukt!</string>
-  <!-- New bow -->
-  <string name="add_bow">Boog toevoegen</string>
-  <string name="name">Naam</string>
-  <string name="bow_type">Boog type</string>
-  <string name="properties">Eigenschappen</string>
-  <string name="brand">Merk</string>
-  <string name="size">Grootte</string>
-  <string name="description">Omschrijving</string>
-  <string name="height">Peeshoogte</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Vizier instellingen</string>
-  <string name="add">Toevoegen</string>
-  <string name="take_picture">Neem een foto</string>
-  <string name="pick_from_gallery">Kies een afbeelding uit gallerij</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Pijl toevoegen</string>
-  <string name="length">Lengte</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Gewicht</string>
-  <string name="vanes">Veren</string>
-  <string name="nock">Nok</string>
-  <string name="material">Materiaal</string>
-  <!-- New round -->
-  <string name="title">Titel</string>
-  <string name="outdoor">Buiten</string>
-  <string name="indoor">Binnen</string>
-  <string name="distance">Afstand</string>
-  <string name="format">Formaat</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d beurt</item>
-    <item quantity="other">%d beurten</item>
-  </plurals>
-  <string name="with">van</string>
-  <plurals name="arrow">
-    <item quantity="one">%d pijl</item>
-    <item quantity="other">%d pijlen</item>
-  </plurals>
-  <string name="target_face">Blazoen</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scorebord</string>
-  <string name="arrows">Pijlen</string>
-  <string name="sum">Sub-Totaal</string>
-  <string name="carry">Totaal</string>
-  <string name="action_print">Afdrukken</string>
-  <string name="average">Gemiddelde</string>
-  <!-- Input mode -->
-  <string name="comment">Opmerking</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Kies een bestand</string>
-  <string name="dir_not_created">Map kon niet worden aangemaakt!</string>
-  <string name="import_failed">Importeren mislukt!</string>
-  <string name="file_not_found">Bestand niet gevonden!</string>
-  <string name="failed_reading_file">Lezen van bestand mislukt!</string>
-  <!-- Donate -->
-  <string name="donate_2">Doneer mij een hamburger</string>
-  <string name="donate_5">Doneer mij een kebab</string>
-  <string name="donate_10">Doneer mij een grote pizza</string>
-  <string name="donate_20">Doneer mij wat benzine</string>
-  <string name="donation_thank">Bedankt voor uw donatie!</string>
-  <string name="donate_text" formatted="false"> De bedragen zijn inclusief BTW en 30% kosten voor Google. Als alternatief mag u ook doneren via PayPal, op account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Schietklok</string>
-  <string name="touch_to_start">Raak aan om te starten</string>
-  <string name="preparation">Naar de meet</string>
-  <string name="shooting">Schieten</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Schiettijd</string>
-  <string name="timer_waiting_time">Voorbereidingstijd</string>
-  <string name="timer_warning_time">Waarschuwingstijd</string>
-  <string name="timer_sound">Geluid</string>
-  <string name="timer_vibrate">Trillen</string>
-  <!-- Settings -->
-  <string name="backup_action">Back-up</string>
-  <string name="import_action">Importeren</string>
-  <string name="exports_as_csv">Exporteer als csv</string>
-  <string name="licences">Open Source-Licenties</string>
-  <string name="licences_summary">Licentievoorwaarden</string>
-  <string name="version">Versie %s</string>
-  <plurals name="second">
-    <item quantity="one">%d seconde</item>
-    <item quantity="other">%d seconden</item>
-  </plurals>
-  <string name="info">Informatie</string>
-  <string name="data">Gegevens</string>
-  <string name="weather">Weer</string>
-  <string name="environment">Omgeving</string>
-  <string name="wind_speed">Windsnelheid</string>
-  <string name="wind_direction">Windrichting</string>
-  <string name="sight_setting_removed">Vizier instelling verwijderd!</string>
-  <string name="metric">Metrisch</string>
-  <string name="imperial">Imperiaal</string>
-  <string name="undo">Ongedaan maken</string>
-  <string name="standard_rounds">Standaard ronden</string>
-  <string name="expand_collapse">Uitklappen/Inklappen</string>
-  <string name="new_round_template">Nieuw sjabloon</string>
-  <string name="arrow_numbers">Pijl nummers</string>
-  <string name="round_removed">Ronde verwijderd!</string>
-  <string name="custom_round">Aangepaste ronde</string>
-  <string name="filter">Filter</string>
-  <string name="club">Vereniging</string>
-  <string name="target">Blazoen</string>
-  <string name="standard_round">Standaard ronde</string>
-  <string name="use_as_template">Als sjabloon gebruiken?</string>
-  <string name="create_copy">Dit is een standaard ronde! \nWilt u een kopie maken om te bewerken?</string>
-  <string name="practice">Oefening</string>
-  <string name="edit_training">Training wijzigen</string>
-  <string name="edit_standard_round">Wijzig standaard ronde</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d pijl verwijderd</item>
-    <item quantity="other">%d pijlen verwijderd</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d boog verwijderd</item>
-    <item quantity="other">%d bogen verwijderd</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training verwijderd</item>
-    <item quantity="other">%d trainingen verwijderd</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d beurt verwijderd</item>
-    <item quantity="other">%d beurten verwijderd</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Ronde %d</item>
-    <item quantity="other">Ronde %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d ronde geselecteerd</item>
-    <item quantity="other">%d rondes geselecteerd</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d ronde verwijderd</item>
-    <item quantity="other">%d rondes verwijderd</item>
-  </plurals>
-  <string name="date">Datum</string>
-  <string name="edit_round">Ronde wijzigen</string>
-  <string name="draw_weight">Trekgewicht</string>
-  <string name="sight">Vizier</string>
-  <string name="limbs">Latten</string>
-  <string name="my_bow">Mijn boog</string>
-  <string name="my_arrow">Mijn pijl</string>
-  <string name="tip_weight">Gewicht punt</string>
-  <string name="arrow_ranking">Pijl ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Pijl %1$s van %2$s</string>
-  <string name="display">Beeld</string>
-  <string name="print">Afdrukken</string>
-  <string name="table">Tabel</string>
-  <string name="comments">Opmerkingen</string>
-  <string name="show_points_colored">Toon punten gekleurd</string>
-  <string name="stabilizer">Stabilisator</string>
-  <string name="clicker">Klikker</string>
-  <string name="arrow_number_x">Pijl nummer %s</string>
-  <string name="training_with_standard_round">Training met standaard ronde</string>
-  <string name="free_training">Vrije training</string>
-  <string name="competition">Competitie</string>
-  <string name="about">Over</string>
-  <string name="general">Algemeen</string>
-  <string name="contribute">Bijdragen</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Speciale dank aan</string>
-  <string name="all_translators">Alle mensen die hebben meegeholpen in het vertalen van de app!</string>
-  <string name="all_beta_testers">Iedereen die tot de groep bèta-testers is toegetreden en zo continue bijdragen aan het verbeteren van de app.</string>
-  <string name="test_beta">Test de laatste bèta versie</string>
-  <string name="join_on_google_plus">Volg ons op Google+</string>
-  <string name="share_with_friends">Deel met uw vrienden</string>
-  <string name="donate">Doneren</string>
-  <string name="donate_via_paypal">Doneer via PayPal</string>
-  <string name="translate_crowdin">Vertaal op Crowdin</string>
-  <string name="network_linkedin">Netwerk op LinkedIn</string>
-  <string name="search">Zoeken</string>
-  <string name="us">Verenigde Staten</string>
-  <string name="show_shots_training">Hele training</string>
-  <string name="show_shots_round">Huidige ronde</string>
-  <string name="show_shots_end">Huidige beurt</string>
-  <string name="profile">Profiel</string>
-  <string name="birthday">Geboortedatum</string>
-  <string name="first_name">Voornaam</string>
-  <string name="last_name">Achternaam</string>
-  <string name="age">Leeftijd</string>
-  <string name="show_signature">Handtekening</string>
-  <string name="archer">Schutter</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Gemist</string>
-  <string name="new_end">Nieuwe beurt</string>
-  <string name="distribution">Distributie</string>
-  <string name="count">Aantal</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Invoer</string>
-  <string name="target_zoom">Blazoen vergrotings niveau</string>
-  <string name="action_pdf">Exporteer als PDF</string>
-  <string name="arrow_diameter_scale">Pijl diameter schaal</string>
-  <string name="timestamp">Tijdstip</string>
-  <string name="change_target_face">Verander blazoen</string>
-  <string name="your_first_training">Uw eerste training</string>
-  <string name="grouping">Groepering</string>
-  <string name="show_clusters">Groepen</string>
-  <string name="first_training_description">Tik op de plusknop om te beginnen met een nieuwe training.</string>
-  <string name="show_average">Gemiddelde</string>
-  <string name="show_none">Geen</string>
-  <string name="left_handed">Linkshandig</string>
-  <string name="right_handed">Rechtshandig</string>
-  <string name="keyboard">Toetsenbord</string>
-  <string name="backup_drive_desc">Door uw trainings gegevens te back-uppen kunt u deze herstellen in het geval dat u uw telefoon verliest of vervangt.</string>
-  <string name="backup_now">Nu een back-up maken</string>
-  <string name="last_backup">Laatste back-up: %s</string>
-  <string name="recent_backups">Recente back-ups</string>
-  <string name="dialog_restore_title">Terugkeren naar vorige versie</string>
-  <string name="restore_desc">Het herstellen van de gegevens zal alle bestaande gegevens overschrijven met de back-up.</string>
-  <string name="backup_details">Back-up details</string>
-  <string name="restore">Herstel</string>
-  <string name="backup_location">Back-up locatie</string>
-  <string name="internal_storage">Interne opslag</string>
-  <string name="automatic_backup">Automatische back-up</string>
-  <string name="restoring">Back-up terugzetten…</string>
-  <string name="restore_failed">Herstellen mislukt</string>
-  <string name="delete_failed">Verwijderen mislukt</string>
-  <string name="backup_restore_desc">Back-up en herstel app gegevens</string>
-  <string name="exporting">Exporteren…</string>
-  <string name="loading_backups_failed">Back-ups laden mislukt!</string>
-  <string name="external_storage">Externe opslag</string>
-  <string name="backup_interval">Back-up interval</string>
-  <string name="daily">Dagelijks</string>
-  <string name="weekly">Wekelijks</string>
-  <string name="monthly">Maandelijks</string>
-  <string name="connection_failed">Verbinding mislukt!</string>
-  <string name="shooting_indoor">Binnen schieten</string>
-  <string name="bow_rest_vertical_position">Verticale positie</string>
-  <string name="bow_rest">Pijlensteun</string>
-  <string name="bow_rest_horizontal_position">Horizontale positie</string>
-  <string name="bow_cam_settings">Cam instellingen</string>
-  <string name="bow_letoff_weight">Let-off gewicht</string>
-  <string name="bow_nocking_point">Nokpunt</string>
-  <string name="bow_string">Pees</string>
-  <string name="bow_scope_magnification">Vergroting vizier</string>
-  <string name="bow_rest_stiffness">Stijfheid</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">Meer velden</string>
-  <string name="recently_used">Recent gebruikt</string>
-  <string name="intro_title_track_training_progress">Vergeet papiere scoresheets!</string>
-  <string name="intro_description_track_training_progress">Met precies pijlen plotten,\nkan u nuttige inzichten krijgen\n uit uw trainings data.</string>
-  <string name="intro_title_everything_in_one_place">Alles wat u nodig heeft\nin een plaats</string>
-  <string name="intro_description_everything_in_one_place">Inclusief boog, pijl\nen vizier management,\nhandboogklok, statestieken \nen veel meer…</string>
-  <string name="average_arrow_score_per_end">Gemmidelde score pijl per beurt</string>
-  <string name="show_end">Toon beurt</string>
-  <string name="show_round">Toon ronde</string>
-  <string name="show_training">Toon training</string>
-  <string name="summary">Samenvatting</string>
-  <string name="end">Beurt</string>
-  <string name="average_of">Gemiddelde van</string>
-  <string name="displayed_shots">Weergegeven schoten</string>
-  <string name="invalid_decimal_number">Ongeldig decimaal getal</string>
-  <string name="not_within_expected_range_mm">Niet binnen het verwachte bereik van 1 tot 20 mm</string>
-  <string name="not_within_expected_range_inch">Niet binnen het verwachte bereik van 0 tot 1 inch</string>
-  <string name="next_round">Volgende ronde</string>
-  <string name="previous_round">Vorige ronde</string>
-  <string name="overview">Overzicht</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Toon bereikte score</string>
-  <string name="show_total_score">Toon totale score</string>
-  <string name="show_percentage">Percentage weergeven</string>
-  <string name="show_arrow_average">Pijl gemiddelde weergeven</string>
-  <string name="image_deleted">Afbeelding verwijderd</string>
-  <string name="delete_image">Verwijder afbeelding?</string>
-  <string name="keyboard_type">Toetsenbord soort</string>
-  <string name="keyboard_enabled">Toetsenbord ingeschakeld</string>
-  <string name="sort_shots">Sorteer schoten</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Taal</string>
-  <string name="warning_backup_experimental">Waarschuwing: Deze functie is nog experimenteel! Gelieve regelmatig te controleren of de back-up echt succesvol was!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Hulp</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">Je hebt momenteel nog geen trainingen!</string>
-  <string name="no_bows">Geen bogen</string>
-  <string name="no_arrows">Geen pijlen</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Versie</string>
-  <string name="max_arrow_number">Maximum aantal pijlen</string>
-  <string name="distances">Afstanden</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bogen</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Beurt %1$d/%2$d</string>
-  <string name="round_x_of_y">Ronde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Timer aanpassen</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Geef persoonlijke informatie in</string>
-  <string name="licence_number">Licentie nummer</string>
-  <string name="file_type">Bestand type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF bestand</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Combineer spots tot één blazoen</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opties</string>
+    <string name="settings">Instellingen</string>
+    <string name="prev">Vorige</string>
+    <string name="next">Volgende</string>
+    <string name="save">Opslaan</string>
+    <string name="custom">Aangepast</string>
+    <string name="training">Training</string>
+    <string name="bow">Boog</string>
+    <string name="arrow">Pijl</string>
+    <string name="round">Ronde</string>
+    <string name="points">Punten</string>
+    <string name="passe">Beurt</string>
+    <!-- Overview -->
+    <string name="new_training">Nieuwe training</string>
+    <string name="new_bow">Nieuwe boog</string>
+    <string name="new_arrow">Nieuwe pijl</string>
+    <string name="new_round">Nieuwe ronde</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training geselecteerd</item>
+        <item quantity="other">%d trainingen geselecteerd</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d boog geselecteerd</item>
+        <item quantity="other">%d bogen geselecteerd</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d pijl geselecteerd</item>
+        <item quantity="other">%d pijlen geselecteerd</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d beurt geselecteerd</item>
+        <item quantity="other">%d beurten geselecteerd</item>
+    </plurals>
+    <string name="edit">Wijzigen</string>
+    <string name="delete">Verwijderen</string>
+    <string name="statistic">Statistiek</string>
+    <!-- Share -->
+    <string name="share">Delen</string>
+    <string name="dispersion_pattern">Verspreidingspatroon</string>
+    <string name="sharing_failed">Delen mislukt!</string>
+    <!-- Export -->
+    <string name="send_exported">Geëxporteerde data versturen</string>
+    <string name="exporting_failed">Exporteren mislukt!</string>
+    <!-- New bow -->
+    <string name="add_bow">Boog toevoegen</string>
+    <string name="name">Naam</string>
+    <string name="bow_type">Boog type</string>
+    <string name="properties">Eigenschappen</string>
+    <string name="brand">Merk</string>
+    <string name="size">Grootte</string>
+    <string name="description">Omschrijving</string>
+    <string name="height">Peeshoogte</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Vizier instellingen</string>
+    <string name="add">Toevoegen</string>
+    <string name="take_picture">Neem een foto</string>
+    <string name="pick_from_gallery">Kies een afbeelding uit gallerij</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Pijl toevoegen</string>
+    <string name="length">Lengte</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Gewicht</string>
+    <string name="vanes">Veren</string>
+    <string name="nock">Nok</string>
+    <string name="material">Materiaal</string>
+    <!-- New round -->
+    <string name="title">Titel</string>
+    <string name="outdoor">Buiten</string>
+    <string name="indoor">Binnen</string>
+    <string name="distance">Afstand</string>
+    <string name="format">Formaat</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d beurt</item>
+        <item quantity="other">%d beurten</item>
+    </plurals>
+    <string name="with">van</string>
+    <plurals name="arrow">
+        <item quantity="one">%d pijl</item>
+        <item quantity="other">%d pijlen</item>
+    </plurals>
+    <string name="target_face">Blazoen</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scorebord</string>
+    <string name="arrows">Pijlen</string>
+    <string name="sum">Sub-Totaal</string>
+    <string name="carry">Totaal</string>
+    <string name="action_print">Afdrukken</string>
+    <string name="average">Gemiddelde</string>
+    <!-- Input mode -->
+    <string name="comment">Opmerking</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Kies een bestand</string>
+    <string name="dir_not_created">Map kon niet worden aangemaakt!</string>
+    <string name="import_failed">Importeren mislukt!</string>
+    <string name="file_not_found">Bestand niet gevonden!</string>
+    <string name="failed_reading_file">Lezen van bestand mislukt!</string>
+    <!-- Donate -->
+    <string name="donate_2">Doneer mij een hamburger</string>
+    <string name="donate_5">Doneer mij een kebab</string>
+    <string name="donate_10">Doneer mij een grote pizza</string>
+    <string name="donate_20">Doneer mij wat benzine</string>
+    <string name="donation_thank">Bedankt voor uw donatie!</string>
+    <string name="donate_text" formatted="false"> De bedragen zijn inclusief BTW en 30% kosten voor Google. Als alternatief mag u ook doneren via PayPal, op account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Schietklok</string>
+    <string name="touch_to_start">Raak aan om te starten</string>
+    <string name="preparation">Naar de meet</string>
+    <string name="shooting">Schieten</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Schiettijd</string>
+    <string name="timer_waiting_time">Voorbereidingstijd</string>
+    <string name="timer_warning_time">Waarschuwingstijd</string>
+    <string name="timer_sound">Geluid</string>
+    <string name="timer_vibrate">Trillen</string>
+    <!-- Settings -->
+    <string name="backup_action">Back-up</string>
+    <string name="import_action">Importeren</string>
+    <string name="exports_as_csv">Exporteer als csv</string>
+    <string name="licences">Open Source-Licenties</string>
+    <string name="licences_summary">Licentievoorwaarden</string>
+    <string name="version">Versie %s</string>
+    <plurals name="second">
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d seconden</item>
+    </plurals>
+    <string name="info">Informatie</string>
+    <string name="data">Gegevens</string>
+    <string name="weather">Weer</string>
+    <string name="environment">Omgeving</string>
+    <string name="wind_speed">Windsnelheid</string>
+    <string name="wind_direction">Windrichting</string>
+    <string name="sight_setting_removed">Vizier instelling verwijderd!</string>
+    <string name="metric">Metrisch</string>
+    <string name="imperial">Imperiaal</string>
+    <string name="undo">Ongedaan maken</string>
+    <string name="standard_rounds">Standaard ronden</string>
+    <string name="expand_collapse">Uitklappen/Inklappen</string>
+    <string name="new_round_template">Nieuw sjabloon</string>
+    <string name="arrow_numbers">Pijl nummers</string>
+    <string name="round_removed">Ronde verwijderd!</string>
+    <string name="custom_round">Aangepaste ronde</string>
+    <string name="filter">Filter</string>
+    <string name="club">Vereniging</string>
+    <string name="target">Blazoen</string>
+    <string name="standard_round">Standaard ronde</string>
+    <string name="use_as_template">Als sjabloon gebruiken?</string>
+    <string name="create_copy">Dit is een standaard ronde! \nWilt u een kopie maken om te bewerken?</string>
+    <string name="practice">Oefening</string>
+    <string name="edit_training">Training wijzigen</string>
+    <string name="edit_standard_round">Wijzig standaard ronde</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d pijl verwijderd</item>
+        <item quantity="other">%d pijlen verwijderd</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d boog verwijderd</item>
+        <item quantity="other">%d bogen verwijderd</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training verwijderd</item>
+        <item quantity="other">%d trainingen verwijderd</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d beurt verwijderd</item>
+        <item quantity="other">%d beurten verwijderd</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Ronde %d</item>
+        <item quantity="other">Ronde %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d ronde geselecteerd</item>
+        <item quantity="other">%d rondes geselecteerd</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d ronde verwijderd</item>
+        <item quantity="other">%d rondes verwijderd</item>
+    </plurals>
+    <string name="date">Datum</string>
+    <string name="edit_round">Ronde wijzigen</string>
+    <string name="draw_weight">Trekgewicht</string>
+    <string name="sight">Vizier</string>
+    <string name="limbs">Latten</string>
+    <string name="my_bow">Mijn boog</string>
+    <string name="my_arrow">Mijn pijl</string>
+    <string name="tip_weight">Gewicht punt</string>
+    <string name="arrow_ranking">Pijl ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Pijl %1$s van %2$s</string>
+    <string name="display">Beeld</string>
+    <string name="print">Afdrukken</string>
+    <string name="table">Tabel</string>
+    <string name="comments">Opmerkingen</string>
+    <string name="show_points_colored">Toon punten gekleurd</string>
+    <string name="stabilizer">Stabilisator</string>
+    <string name="clicker">Klikker</string>
+    <string name="arrow_number_x">Pijl nummer %s</string>
+    <string name="training_with_standard_round">Training met standaard ronde</string>
+    <string name="free_training">Vrije training</string>
+    <string name="competition">Competitie</string>
+    <string name="about">Over</string>
+    <string name="general">Algemeen</string>
+    <string name="contribute">Bijdragen</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Speciale dank aan</string>
+    <string name="all_translators">Alle mensen die hebben meegeholpen in het vertalen van de app!</string>
+    <string name="all_beta_testers">Iedereen die tot de groep bèta-testers is toegetreden en zo continue bijdragen aan het verbeteren van de app.</string>
+    <string name="test_beta">Test de laatste bèta versie</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Deel met uw vrienden</string>
+    <string name="donate">Doneren</string>
+    <string name="donate_via_paypal">Doneer via PayPal</string>
+    <string name="translate_crowdin">Vertaal op Crowdin</string>
+    <string name="network_linkedin">Netwerk op LinkedIn</string>
+    <string name="search">Zoeken</string>
+    <string name="us">Verenigde Staten</string>
+    <string name="show_shots_training">Hele training</string>
+    <string name="show_shots_round">Huidige ronde</string>
+    <string name="show_shots_end">Huidige beurt</string>
+    <string name="profile">Profiel</string>
+    <string name="birthday">Geboortedatum</string>
+    <string name="first_name">Voornaam</string>
+    <string name="last_name">Achternaam</string>
+    <string name="age">Leeftijd</string>
+    <string name="show_signature">Handtekening</string>
+    <string name="archer">Schutter</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Gemist</string>
+    <string name="new_end">Nieuwe beurt</string>
+    <string name="distribution">Distributie</string>
+    <string name="count">Aantal</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Invoer</string>
+    <string name="target_zoom">Blazoen vergrotings niveau</string>
+    <string name="action_pdf">Exporteer als PDF</string>
+    <string name="arrow_diameter_scale">Pijl diameter schaal</string>
+    <string name="timestamp">Tijdstip</string>
+    <string name="change_target_face">Verander blazoen</string>
+    <string name="your_first_training">Uw eerste training</string>
+    <string name="grouping">Groepering</string>
+    <string name="show_clusters">Groepen</string>
+    <string name="first_training_description">Tik op de plusknop om te beginnen met een nieuwe training.</string>
+    <string name="show_average">Gemiddelde</string>
+    <string name="show_none">Geen</string>
+    <string name="left_handed">Linkshandig</string>
+    <string name="right_handed">Rechtshandig</string>
+    <string name="keyboard">Toetsenbord</string>
+    <string name="backup_drive_desc">Door uw trainings gegevens te back-uppen kunt u deze herstellen in het geval dat u uw telefoon verliest of vervangt.</string>
+    <string name="backup_now">Nu een back-up maken</string>
+    <string name="last_backup">Laatste back-up: %s</string>
+    <string name="recent_backups">Recente back-ups</string>
+    <string name="dialog_restore_title">Terugkeren naar vorige versie</string>
+    <string name="restore_desc">Het herstellen van de gegevens zal alle bestaande gegevens overschrijven met de back-up.</string>
+    <string name="backup_details">Back-up details</string>
+    <string name="restore">Herstel</string>
+    <string name="backup_location">Back-up locatie</string>
+    <string name="internal_storage">Interne opslag</string>
+    <string name="automatic_backup">Automatische back-up</string>
+    <string name="restoring">Back-up terugzetten…</string>
+    <string name="restore_failed">Herstellen mislukt</string>
+    <string name="delete_failed">Verwijderen mislukt</string>
+    <string name="backup_restore_desc">Back-up en herstel app gegevens</string>
+    <string name="exporting">Exporteren…</string>
+    <string name="loading_backups_failed">Back-ups laden mislukt!</string>
+    <string name="external_storage">Externe opslag</string>
+    <string name="backup_interval">Back-up interval</string>
+    <string name="daily">Dagelijks</string>
+    <string name="weekly">Wekelijks</string>
+    <string name="monthly">Maandelijks</string>
+    <string name="connection_failed">Verbinding mislukt!</string>
+    <string name="shooting_indoor">Binnen schieten</string>
+    <string name="bow_rest_vertical_position">Verticale positie</string>
+    <string name="bow_rest">Pijlensteun</string>
+    <string name="bow_rest_horizontal_position">Horizontale positie</string>
+    <string name="bow_cam_settings">Cam instellingen</string>
+    <string name="bow_letoff_weight">Let-off gewicht</string>
+    <string name="bow_nocking_point">Nokpunt</string>
+    <string name="bow_string">Pees</string>
+    <string name="bow_scope_magnification">Vergroting vizier</string>
+    <string name="bow_rest_stiffness">Stijfheid</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">Meer velden</string>
+    <string name="recently_used">Recent gebruikt</string>
+    <string name="intro_title_track_training_progress">Vergeet papiere scoresheets!</string>
+    <string name="intro_description_track_training_progress">Met precies pijlen plotten,\nkan u nuttige inzichten krijgen\n uit uw trainings data.</string>
+    <string name="intro_title_everything_in_one_place">Alles wat u nodig heeft\nin een plaats</string>
+    <string name="intro_description_everything_in_one_place">Inclusief boog, pijl\nen vizier management,\nhandboogklok, statestieken \nen veel meer…</string>
+    <string name="average_arrow_score_per_end">Gemmidelde score pijl per beurt</string>
+    <string name="show_end">Toon beurt</string>
+    <string name="show_round">Toon ronde</string>
+    <string name="show_training">Toon training</string>
+    <string name="summary">Samenvatting</string>
+    <string name="end">Beurt</string>
+    <string name="average_of">Gemiddelde van</string>
+    <string name="displayed_shots">Weergegeven schoten</string>
+    <string name="invalid_decimal_number">Ongeldig decimaal getal</string>
+    <string name="not_within_expected_range_mm">Niet binnen het verwachte bereik van 1 tot 20 mm</string>
+    <string name="not_within_expected_range_inch">Niet binnen het verwachte bereik van 0 tot 1 inch</string>
+    <string name="next_round">Volgende ronde</string>
+    <string name="previous_round">Vorige ronde</string>
+    <string name="overview">Overzicht</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Toon bereikte score</string>
+    <string name="show_total_score">Toon totale score</string>
+    <string name="show_percentage">Percentage weergeven</string>
+    <string name="show_arrow_average">Pijl gemiddelde weergeven</string>
+    <string name="image_deleted">Afbeelding verwijderd</string>
+    <string name="delete_image">Verwijder afbeelding?</string>
+    <string name="keyboard_type">Toetsenbord soort</string>
+    <string name="keyboard_enabled">Toetsenbord ingeschakeld</string>
+    <string name="sort_shots">Sorteer schoten</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Taal</string>
+    <string name="warning_backup_experimental">Waarschuwing: Deze functie is nog experimenteel! Gelieve regelmatig te controleren of de back-up echt succesvol was!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Hulp</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">Je hebt momenteel nog geen trainingen!</string>
+    <string name="no_bows">Geen bogen</string>
+    <string name="no_arrows">Geen pijlen</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Versie</string>
+    <string name="max_arrow_number">Maximum aantal pijlen</string>
+    <string name="distances">Afstanden</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bogen</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Beurt %1$d/%2$d</string>
+    <string name="round_x_of_y">Ronde %1$d/%2$d</string>
+    <string name="settings_summary_timer">Timer aanpassen</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Geef persoonlijke informatie in</string>
+    <string name="licence_number">Licentie nummer</string>
+    <string name="file_type">Bestand type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF bestand</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Combineer spots tot één blazoen</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 57f73226d..de2a5ff3b 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Instillinger</string>
-  <string name="settings">Innstillinger</string>
-  <string name="prev">Forrige</string>
-  <string name="next">Neste</string>
-  <string name="save">Lagre</string>
-  <string name="custom">Spesial</string>
-  <string name="training">Trening</string>
-  <string name="bow">Bue</string>
-  <string name="arrow">Piler</string>
-  <string name="round">Runde</string>
-  <string name="points">Poeng</string>
-  <string name="passe">Runde</string>
-  <!-- Overview -->
-  <string name="new_training">Ny trening</string>
-  <string name="new_bow">Ny bue</string>
-  <string name="new_arrow">Nye piler</string>
-  <string name="new_round">Ny runde</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d trening valgt</item>
-    <item quantity="other">%d Treninger valgt</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bue valgt</item>
-    <item quantity="other">%d buer valgt</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d piler valgt</item>
-    <item quantity="other">%d piler valgt</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d Runde valgt</item>
-    <item quantity="other">%d Runder valgt</item>
-  </plurals>
-  <string name="edit">Endre</string>
-  <string name="delete">Fjern</string>
-  <string name="statistic">Statistikk</string>
-  <!-- Share -->
-  <string name="share">Del</string>
-  <string name="dispersion_pattern">Pil fordelings modell</string>
-  <string name="sharing_failed">Deling mislyktes!</string>
-  <!-- Export -->
-  <string name="send_exported">Send eksportert data</string>
-  <string name="exporting_failed">Eksportering mislyktes!</string>
-  <!-- New bow -->
-  <string name="add_bow">Legg til bue</string>
-  <string name="name">Navn</string>
-  <string name="bow_type">Bue type</string>
-  <string name="properties">Egenskaper</string>
-  <string name="brand">Merke</string>
-  <string name="size">Størrelse</string>
-  <string name="description">Beskrivelse</string>
-  <string name="height">Streng høyde</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Siktemerker</string>
-  <string name="add">Legg til</string>
-  <string name="take_picture">Ta et bilde</string>
-  <string name="pick_from_gallery">Velg et bilde fra galleri</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Legg til piler</string>
-  <string name="length">Lengde</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Vekt</string>
-  <string name="vanes">Fjærer</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Tittel</string>
-  <string name="outdoor">Utendørs</string>
-  <string name="indoor">Innendørs</string>
-  <string name="distance">Avstand</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d runde</item>
-    <item quantity="other">%d runder</item>
-  </plurals>
-  <string name="with">av</string>
-  <plurals name="arrow">
-    <item quantity="one">%d piler</item>
-    <item quantity="other">%d piler</item>
-  </plurals>
-  <string name="target_face">Blink</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scorekort</string>
-  <string name="arrows">Piler</string>
-  <string name="sum">Sum</string>
-  <string name="carry">Overføre</string>
-  <string name="action_print">Print</string>
-  <string name="average">Gjennomsnitt</string>
-  <!-- Input mode -->
-  <string name="comment">Kommentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Velg en fil</string>
-  <string name="dir_not_created">Katalog kunne ikke opprettes!</string>
-  <string name="import_failed">Importering mislyktes!</string>
-  <string name="file_not_found">Fil ikke funnet!</string>
-  <string name="failed_reading_file">Lesing av fil mislyktes!</string>
-  <!-- Donate -->
-  <string name="donate_2">Doner meg en burger</string>
-  <string name="donate_5">Doner meg en kebab</string>
-  <string name="donate_10">Doner meg en stor pizza</string>
-  <string name="donate_20">Doner meg litt drivstoff</string>
-  <string name="donation_thank">Takk for din støtte!</string>
-  <string name="donate_text" formatted="false">Beløpene er inkl. mva. og 30% gebyr for Google. Alternativt kan du gledelig donere til PayPal brukeren min: dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Tidtaker</string>
-  <string name="touch_to_start">Trykk for å starte</string>
-  <string name="preparation">Gjør deg klar</string>
-  <string name="shooting">Skyting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Skytetid</string>
-  <string name="timer_waiting_time">Forberedelses tid</string>
-  <string name="timer_warning_time">Varslingstid</string>
-  <string name="timer_sound">Lyd</string>
-  <string name="timer_vibrate">Vibrering</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Importer</string>
-  <string name="exports_as_csv">Eksporter som csv</string>
-  <string name="licences">Åpne kildekode-lisenser</string>
-  <string name="licences_summary">Juridisk notater til lisenser</string>
-  <string name="version">Versjon %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekund</item>
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <string name="info">Informasjon</string>
-  <string name="data">Data</string>
-  <string name="weather">Vær</string>
-  <string name="environment">Omgivelser</string>
-  <string name="wind_speed">Vindstyrke</string>
-  <string name="wind_direction">Vindretning</string>
-  <string name="sight_setting_removed">Siktemerket slettet!</string>
-  <string name="metric">Metrisk</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Angre</string>
-  <string name="standard_rounds">Standard runder</string>
-  <string name="expand_collapse">Vis/Sjul</string>
-  <string name="new_round_template">Ny mal</string>
-  <string name="arrow_numbers">Pil nummer</string>
-  <string name="round_removed">Runde slettet!</string>
-  <string name="custom_round">Tilpasset runde</string>
-  <string name="filter">Filter</string>
-  <string name="club">Klub</string>
-  <string name="target">Skiveskyting</string>
-  <string name="standard_round">Standard runde</string>
-  <string name="use_as_template">Bruke som mal?</string>
-  <string name="create_copy">Dette er en standard runde!\nØnsker du å lagen en kopi for å redigere den?</string>
-  <string name="practice">Trening</string>
-  <string name="edit_training">Endre trening</string>
-  <string name="edit_standard_round">Endre standard runde</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d piler slettet</item>
-    <item quantity="other">%d piler slettet</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bue slettet</item>
-    <item quantity="other">%d buer slettet</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d trening slettet</item>
-    <item quantity="other">%d treninger slettet</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d runde slettet</item>
-    <item quantity="other">%d runder slettet</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Runde %d</item>
-    <item quantity="other">Runde %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d runde valgt</item>
-    <item quantity="other">%d runder valgt</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d runde slettet</item>
-    <item quantity="other">%d runder slettet</item>
-  </plurals>
-  <string name="date">Dato</string>
-  <string name="edit_round">Endre runde</string>
-  <string name="draw_weight">Pound styrke</string>
-  <string name="sight">Sikte</string>
-  <string name="limbs">Lemmer</string>
-  <string name="my_bow">Min bue</string>
-  <string name="my_arrow">Mine piler</string>
-  <string name="tip_weight">Spiss vekt</string>
-  <string name="arrow_ranking">Pil rangering</string>
-  <string name="arrow_x_of_set_of_arrows">Pil %1$s av %2$s</string>
-  <string name="display">Vis</string>
-  <string name="print">Print</string>
-  <string name="table">Tabell</string>
-  <string name="comments">Kommentarer</string>
-  <string name="show_points_colored">Vis poeng farget</string>
-  <string name="stabilizer">Stabilisator</string>
-  <string name="clicker">Klikker</string>
-  <string name="arrow_number_x">Pil nummer %s</string>
-  <string name="training_with_standard_round">Trening med Standard Runde</string>
-  <string name="free_training">Fri Trening</string>
-  <string name="competition">Konkurranse</string>
-  <string name="about">Om</string>
-  <string name="general">Generelt</string>
-  <string name="contribute">Bidra</string>
-  <string name="connect">Logg på</string>
-  <string name="special_thanks_to">Spesiell takk til</string>
-  <string name="all_translators">Alle som bidro til å oversette appen!</string>
-  <string name="all_beta_testers">Alle som ble med i beta tester gruppen og derfor hjelper å forbedre appen.</string>
-  <string name="test_beta">Test den nyeste beta versjonen</string>
-  <string name="join_on_google_plus">Bli med oss på Google+</string>
-  <string name="share_with_friends">Del med vennene dine</string>
-  <string name="donate">Doner</string>
-  <string name="donate_via_paypal">Doner via PayPal</string>
-  <string name="translate_crowdin">Oversett på Crowdin</string>
-  <string name="network_linkedin">Nettverk på LinkedIn</string>
-  <string name="search">Søk</string>
-  <string name="us">OSS</string>
-  <string name="show_shots_training">Hele treningen</string>
-  <string name="show_shots_round">Gjeldene runde</string>
-  <string name="show_shots_end">Gjeldene runde</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Bursdag</string>
-  <string name="first_name">Fornavn</string>
-  <string name="last_name">Etternavn</string>
-  <string name="age">Alder</string>
-  <string name="show_signature">Signatur</string>
-  <string name="archer">Skytter</string>
-  <string name="hits">Treff</string>
-  <string name="misses">Bom</string>
-  <string name="new_end">Ny runde</string>
-  <string name="distribution">Fordeling</string>
-  <string name="count">Antall</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Blink zoom nivå</string>
-  <string name="action_pdf">Eksporter som PDF</string>
-  <string name="arrow_diameter_scale">Pil diameter skala</string>
-  <string name="timestamp">Tidsstempel</string>
-  <string name="change_target_face">Endre blink type</string>
-  <string name="your_first_training">Din første trening</string>
-  <string name="grouping">Gruppering</string>
-  <string name="show_clusters">Klynger</string>
-  <string name="first_training_description">Trykk på pluss-tegnet for å starte en ny trening.</string>
-  <string name="show_average">Gjennomsnitt</string>
-  <string name="show_none">Ingen</string>
-  <string name="left_handed">Venstrehendt</string>
-  <string name="right_handed">Høyrehendt</string>
-  <string name="keyboard">Tastatur</string>
-  <string name="backup_drive_desc">Å sikkerhetskopiere data tillater deg å gjenopprette alle treningene dine i tilfelle du mister eller bytter mobil.</string>
-  <string name="backup_now">Sikkerhetskopier nå</string>
-  <string name="last_backup">Siste sikkerhetskopiering: %s</string>
-  <string name="recent_backups">Nylige sikkerhetskopieringer</string>
-  <string name="dialog_restore_title">Gå tilbake til den versjonen</string>
-  <string name="restore_desc">Gjenopprette data vil overskrive alle eksisterende data.</string>
-  <string name="backup_details">Sikkerhetskopier detaljer</string>
-  <string name="restore">Gjenopprett</string>
-  <string name="backup_location">Sikkerhetskopiplassering</string>
-  <string name="internal_storage">Intern lagring</string>
-  <string name="automatic_backup">Automatisk sikkerhetskopiering</string>
-  <string name="restoring">Gjenoppretter sikkerhetskopi…</string>
-  <string name="restore_failed">Gjenoppretting mislyktes</string>
-  <string name="delete_failed">Sletting mislyktes</string>
-  <string name="backup_restore_desc">Sikkerhetskopier og gjenopprett app data</string>
-  <string name="exporting">Eksporterer…</string>
-  <string name="loading_backups_failed">Gjenoppretting av sikkerhetskopiering mislyktes!</string>
-  <string name="external_storage">Ekstern lagring</string>
-  <string name="backup_interval">Sikkerhetskopieringsintervall</string>
-  <string name="daily">Daglig</string>
-  <string name="weekly">Ukentlig</string>
-  <string name="monthly">Månedlig</string>
-  <string name="connection_failed">Tilkobling mislyktes!</string>
-  <string name="shooting_indoor">Skyting innendørs</string>
-  <string name="bow_rest_vertical_position">Vertikal posisjon</string>
-  <string name="bow_rest">Pilhylle</string>
-  <string name="bow_rest_horizontal_position">Horisontal posisjon</string>
-  <string name="bow_cam_settings">Cam instillinger</string>
-  <string name="bow_letoff_weight">Letoff vekt</string>
-  <string name="bow_nocking_point">Nock punkt</string>
-  <string name="bow_string">Streng</string>
-  <string name="bow_scope_magnification">Scope forstørrelse</string>
-  <string name="bow_rest_stiffness">Stivhet</string>
-  <string name="bow_button">Avtrekker</string>
-  <string name="more_fields">Flere felt</string>
-  <string name="recently_used">Nylig brukt</string>
-  <string name="intro_title_track_training_progress">Glem papir scorekort!</string>
-  <string name="intro_description_track_training_progress">Med nøyaktig pil plotting, kan \ndu få mer nyttig insikt\nut av treningsdataene.</string>
-  <string name="intro_title_everything_in_one_place">Alt du trenger\npå ett sted</string>
-  <string name="intro_description_everything_in_one_place">Inkludert bue - pil-\nog håntering av siktemerker \nklasse, statistikk \nog mye mer…</string>
-  <string name="average_arrow_score_per_end">Gjennomsnittlig poeng per pil, per runde</string>
-  <string name="show_end">Vis runde</string>
-  <string name="show_round">Vis runde</string>
-  <string name="show_training">Vis trening</string>
-  <string name="summary">Sammendrag</string>
-  <string name="end">Avslutt</string>
-  <string name="average_of">Gjennomsnitt</string>
-  <string name="displayed_shots">Viste skudd</string>
-  <string name="invalid_decimal_number">Ugyldig desimalnummer</string>
-  <string name="not_within_expected_range_mm">Ikke innen forventet mål 1 til 20 mm</string>
-  <string name="not_within_expected_range_inch">Ikke innen forventet mål 0 å 1 tommer</string>
-  <string name="next_round">Neste runde</string>
-  <string name="previous_round">Forrige runde</string>
-  <string name="overview">Overblikk</string>
-  <string name="score">Poengsum</string>
-  <string name="show_reached_score">Vis nådd poengsum</string>
-  <string name="show_total_score">Vis total poengsum</string>
-  <string name="show_percentage">Vis prosent</string>
-  <string name="show_arrow_average">Vis pil gjennomsnitt</string>
-  <string name="image_deleted">Norwegian</string>
-  <string name="delete_image">Norwegian</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Språk</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Runde %1$d/%2$d</string>
-  <string name="round_x_of_y">Runde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Instillinger</string>
+    <string name="settings">Innstillinger</string>
+    <string name="prev">Forrige</string>
+    <string name="next">Neste</string>
+    <string name="save">Lagre</string>
+    <string name="custom">Spesial</string>
+    <string name="training">Trening</string>
+    <string name="bow">Bue</string>
+    <string name="arrow">Piler</string>
+    <string name="round">Runde</string>
+    <string name="points">Poeng</string>
+    <string name="passe">Runde</string>
+    <!-- Overview -->
+    <string name="new_training">Ny trening</string>
+    <string name="new_bow">Ny bue</string>
+    <string name="new_arrow">Nye piler</string>
+    <string name="new_round">Ny runde</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d trening valgt</item>
+        <item quantity="other">%d Treninger valgt</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bue valgt</item>
+        <item quantity="other">%d buer valgt</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d piler valgt</item>
+        <item quantity="other">%d piler valgt</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d Runde valgt</item>
+        <item quantity="other">%d Runder valgt</item>
+    </plurals>
+    <string name="edit">Endre</string>
+    <string name="delete">Fjern</string>
+    <string name="statistic">Statistikk</string>
+    <!-- Share -->
+    <string name="share">Del</string>
+    <string name="dispersion_pattern">Pil fordelings modell</string>
+    <string name="sharing_failed">Deling mislyktes!</string>
+    <!-- Export -->
+    <string name="send_exported">Send eksportert data</string>
+    <string name="exporting_failed">Eksportering mislyktes!</string>
+    <!-- New bow -->
+    <string name="add_bow">Legg til bue</string>
+    <string name="name">Navn</string>
+    <string name="bow_type">Bue type</string>
+    <string name="properties">Egenskaper</string>
+    <string name="brand">Merke</string>
+    <string name="size">Størrelse</string>
+    <string name="description">Beskrivelse</string>
+    <string name="height">Streng høyde</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Siktemerker</string>
+    <string name="add">Legg til</string>
+    <string name="take_picture">Ta et bilde</string>
+    <string name="pick_from_gallery">Velg et bilde fra galleri</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Legg til piler</string>
+    <string name="length">Lengde</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Vekt</string>
+    <string name="vanes">Fjærer</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Tittel</string>
+    <string name="outdoor">Utendørs</string>
+    <string name="indoor">Innendørs</string>
+    <string name="distance">Avstand</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d runde</item>
+        <item quantity="other">%d runder</item>
+    </plurals>
+    <string name="with">av</string>
+    <plurals name="arrow">
+        <item quantity="one">%d piler</item>
+        <item quantity="other">%d piler</item>
+    </plurals>
+    <string name="target_face">Blink</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scorekort</string>
+    <string name="arrows">Piler</string>
+    <string name="sum">Sum</string>
+    <string name="carry">Overføre</string>
+    <string name="action_print">Print</string>
+    <string name="average">Gjennomsnitt</string>
+    <!-- Input mode -->
+    <string name="comment">Kommentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Velg en fil</string>
+    <string name="dir_not_created">Katalog kunne ikke opprettes!</string>
+    <string name="import_failed">Importering mislyktes!</string>
+    <string name="file_not_found">Fil ikke funnet!</string>
+    <string name="failed_reading_file">Lesing av fil mislyktes!</string>
+    <!-- Donate -->
+    <string name="donate_2">Doner meg en burger</string>
+    <string name="donate_5">Doner meg en kebab</string>
+    <string name="donate_10">Doner meg en stor pizza</string>
+    <string name="donate_20">Doner meg litt drivstoff</string>
+    <string name="donation_thank">Takk for din støtte!</string>
+    <string name="donate_text" formatted="false">Beløpene er inkl. mva. og 30% gebyr for Google. Alternativt kan du gledelig donere til PayPal brukeren min: dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Tidtaker</string>
+    <string name="touch_to_start">Trykk for å starte</string>
+    <string name="preparation">Gjør deg klar</string>
+    <string name="shooting">Skyting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Skytetid</string>
+    <string name="timer_waiting_time">Forberedelses tid</string>
+    <string name="timer_warning_time">Varslingstid</string>
+    <string name="timer_sound">Lyd</string>
+    <string name="timer_vibrate">Vibrering</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Importer</string>
+    <string name="exports_as_csv">Eksporter som csv</string>
+    <string name="licences">Åpne kildekode-lisenser</string>
+    <string name="licences_summary">Juridisk notater til lisenser</string>
+    <string name="version">Versjon %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <string name="info">Informasjon</string>
+    <string name="data">Data</string>
+    <string name="weather">Vær</string>
+    <string name="environment">Omgivelser</string>
+    <string name="wind_speed">Vindstyrke</string>
+    <string name="wind_direction">Vindretning</string>
+    <string name="sight_setting_removed">Siktemerket slettet!</string>
+    <string name="metric">Metrisk</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Angre</string>
+    <string name="standard_rounds">Standard runder</string>
+    <string name="expand_collapse">Vis/Sjul</string>
+    <string name="new_round_template">Ny mal</string>
+    <string name="arrow_numbers">Pil nummer</string>
+    <string name="round_removed">Runde slettet!</string>
+    <string name="custom_round">Tilpasset runde</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klub</string>
+    <string name="target">Skiveskyting</string>
+    <string name="standard_round">Standard runde</string>
+    <string name="use_as_template">Bruke som mal?</string>
+    <string name="create_copy">Dette er en standard runde!\nØnsker du å lagen en kopi for å redigere den?</string>
+    <string name="practice">Trening</string>
+    <string name="edit_training">Endre trening</string>
+    <string name="edit_standard_round">Endre standard runde</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d piler slettet</item>
+        <item quantity="other">%d piler slettet</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bue slettet</item>
+        <item quantity="other">%d buer slettet</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d trening slettet</item>
+        <item quantity="other">%d treninger slettet</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d runde slettet</item>
+        <item quantity="other">%d runder slettet</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Runde %d</item>
+        <item quantity="other">Runde %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d runde valgt</item>
+        <item quantity="other">%d runder valgt</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d runde slettet</item>
+        <item quantity="other">%d runder slettet</item>
+    </plurals>
+    <string name="date">Dato</string>
+    <string name="edit_round">Endre runde</string>
+    <string name="draw_weight">Pound styrke</string>
+    <string name="sight">Sikte</string>
+    <string name="limbs">Lemmer</string>
+    <string name="my_bow">Min bue</string>
+    <string name="my_arrow">Mine piler</string>
+    <string name="tip_weight">Spiss vekt</string>
+    <string name="arrow_ranking">Pil rangering</string>
+    <string name="arrow_x_of_set_of_arrows">Pil %1$s av %2$s</string>
+    <string name="display">Vis</string>
+    <string name="print">Print</string>
+    <string name="table">Tabell</string>
+    <string name="comments">Kommentarer</string>
+    <string name="show_points_colored">Vis poeng farget</string>
+    <string name="stabilizer">Stabilisator</string>
+    <string name="clicker">Klikker</string>
+    <string name="arrow_number_x">Pil nummer %s</string>
+    <string name="training_with_standard_round">Trening med Standard Runde</string>
+    <string name="free_training">Fri Trening</string>
+    <string name="competition">Konkurranse</string>
+    <string name="about">Om</string>
+    <string name="general">Generelt</string>
+    <string name="contribute">Bidra</string>
+    <string name="connect">Logg på</string>
+    <string name="special_thanks_to">Spesiell takk til</string>
+    <string name="all_translators">Alle som bidro til å oversette appen!</string>
+    <string name="all_beta_testers">Alle som ble med i beta tester gruppen og derfor hjelper å forbedre appen.</string>
+    <string name="test_beta">Test den nyeste beta versjonen</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Del med vennene dine</string>
+    <string name="donate">Doner</string>
+    <string name="donate_via_paypal">Doner via PayPal</string>
+    <string name="translate_crowdin">Oversett på Crowdin</string>
+    <string name="network_linkedin">Nettverk på LinkedIn</string>
+    <string name="search">Søk</string>
+    <string name="us">OSS</string>
+    <string name="show_shots_training">Hele treningen</string>
+    <string name="show_shots_round">Gjeldene runde</string>
+    <string name="show_shots_end">Gjeldene runde</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Bursdag</string>
+    <string name="first_name">Fornavn</string>
+    <string name="last_name">Etternavn</string>
+    <string name="age">Alder</string>
+    <string name="show_signature">Signatur</string>
+    <string name="archer">Skytter</string>
+    <string name="hits">Treff</string>
+    <string name="misses">Bom</string>
+    <string name="new_end">Ny runde</string>
+    <string name="distribution">Fordeling</string>
+    <string name="count">Antall</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Blink zoom nivå</string>
+    <string name="action_pdf">Eksporter som PDF</string>
+    <string name="arrow_diameter_scale">Pil diameter skala</string>
+    <string name="timestamp">Tidsstempel</string>
+    <string name="change_target_face">Endre blink type</string>
+    <string name="your_first_training">Din første trening</string>
+    <string name="grouping">Gruppering</string>
+    <string name="show_clusters">Klynger</string>
+    <string name="first_training_description">Trykk på pluss-tegnet for å starte en ny trening.</string>
+    <string name="show_average">Gjennomsnitt</string>
+    <string name="show_none">Ingen</string>
+    <string name="left_handed">Venstrehendt</string>
+    <string name="right_handed">Høyrehendt</string>
+    <string name="keyboard">Tastatur</string>
+    <string name="backup_drive_desc">Å sikkerhetskopiere data tillater deg å gjenopprette alle treningene dine i tilfelle du mister eller bytter mobil.</string>
+    <string name="backup_now">Sikkerhetskopier nå</string>
+    <string name="last_backup">Siste sikkerhetskopiering: %s</string>
+    <string name="recent_backups">Nylige sikkerhetskopieringer</string>
+    <string name="dialog_restore_title">Gå tilbake til den versjonen</string>
+    <string name="restore_desc">Gjenopprette data vil overskrive alle eksisterende data.</string>
+    <string name="backup_details">Sikkerhetskopier detaljer</string>
+    <string name="restore">Gjenopprett</string>
+    <string name="backup_location">Sikkerhetskopiplassering</string>
+    <string name="internal_storage">Intern lagring</string>
+    <string name="automatic_backup">Automatisk sikkerhetskopiering</string>
+    <string name="restoring">Gjenoppretter sikkerhetskopi…</string>
+    <string name="restore_failed">Gjenoppretting mislyktes</string>
+    <string name="delete_failed">Sletting mislyktes</string>
+    <string name="backup_restore_desc">Sikkerhetskopier og gjenopprett app data</string>
+    <string name="exporting">Eksporterer…</string>
+    <string name="loading_backups_failed">Gjenoppretting av sikkerhetskopiering mislyktes!</string>
+    <string name="external_storage">Ekstern lagring</string>
+    <string name="backup_interval">Sikkerhetskopieringsintervall</string>
+    <string name="daily">Daglig</string>
+    <string name="weekly">Ukentlig</string>
+    <string name="monthly">Månedlig</string>
+    <string name="connection_failed">Tilkobling mislyktes!</string>
+    <string name="shooting_indoor">Skyting innendørs</string>
+    <string name="bow_rest_vertical_position">Vertikal posisjon</string>
+    <string name="bow_rest">Pilhylle</string>
+    <string name="bow_rest_horizontal_position">Horisontal posisjon</string>
+    <string name="bow_cam_settings">Cam instillinger</string>
+    <string name="bow_letoff_weight">Letoff vekt</string>
+    <string name="bow_nocking_point">Nock punkt</string>
+    <string name="bow_string">Streng</string>
+    <string name="bow_scope_magnification">Scope forstørrelse</string>
+    <string name="bow_rest_stiffness">Stivhet</string>
+    <string name="bow_button">Avtrekker</string>
+    <string name="more_fields">Flere felt</string>
+    <string name="recently_used">Nylig brukt</string>
+    <string name="intro_title_track_training_progress">Glem papir scorekort!</string>
+    <string name="intro_description_track_training_progress">Med nøyaktig pil plotting, kan \ndu få mer nyttig insikt\nut av treningsdataene.</string>
+    <string name="intro_title_everything_in_one_place">Alt du trenger\npå ett sted</string>
+    <string name="intro_description_everything_in_one_place">Inkludert bue - pil-\nog håntering av siktemerker \nklasse, statistikk \nog mye mer…</string>
+    <string name="average_arrow_score_per_end">Gjennomsnittlig poeng per pil, per runde</string>
+    <string name="show_end">Vis runde</string>
+    <string name="show_round">Vis runde</string>
+    <string name="show_training">Vis trening</string>
+    <string name="summary">Sammendrag</string>
+    <string name="end">Avslutt</string>
+    <string name="average_of">Gjennomsnitt</string>
+    <string name="displayed_shots">Viste skudd</string>
+    <string name="invalid_decimal_number">Ugyldig desimalnummer</string>
+    <string name="not_within_expected_range_mm">Ikke innen forventet mål 1 til 20 mm</string>
+    <string name="not_within_expected_range_inch">Ikke innen forventet mål 0 å 1 tommer</string>
+    <string name="next_round">Neste runde</string>
+    <string name="previous_round">Forrige runde</string>
+    <string name="overview">Overblikk</string>
+    <string name="score">Poengsum</string>
+    <string name="show_reached_score">Vis nådd poengsum</string>
+    <string name="show_total_score">Vis total poengsum</string>
+    <string name="show_percentage">Vis prosent</string>
+    <string name="show_arrow_average">Vis pil gjennomsnitt</string>
+    <string name="image_deleted">Norwegian</string>
+    <string name="delete_image">Norwegian</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Språk</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Runde %1$d/%2$d</string>
+    <string name="round_x_of_y">Runde %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ddb977439..9809ab1f9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opcje</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Poprzednie</string>
-  <string name="next">Następne</string>
-  <string name="save">Zapisz</string>
-  <string name="custom">Niestandardowe</string>
-  <string name="training">Trening</string>
-  <string name="bow">Łuk</string>
-  <string name="arrow">Strzała</string>
-  <string name="round">Runda</string>
-  <string name="points">Punkty</string>
-  <string name="passe">Koniec</string>
-  <!-- Overview -->
-  <string name="new_training">Nowy trening</string>
-  <string name="new_bow">Nowy łuk</string>
-  <string name="new_arrow">Nowa strzała</string>
-  <string name="new_round">Nowa runda</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d wybrany trening</item>
-    <item quantity="few">%d wybrane treningi</item>
-    <item quantity="many">%d trainings selected</item>
-    <item quantity="other">%d wybranych treningów</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d wybrany łuk</item>
-    <item quantity="few">%d wybrane łuki</item>
-    <item quantity="many">%d bows selected</item>
-    <item quantity="other">%d wybranych łuków</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d wybrana strzała</item>
-    <item quantity="few">%d wybrane strzały</item>
-    <item quantity="many">%d arrows selected</item>
-    <item quantity="other">%d wybranych strzał</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d wybrany koniec</item>
-    <item quantity="few">%d wybrane końce</item>
-    <item quantity="many">%d ends selected</item>
-    <item quantity="other">%d wybranych końców</item>
-  </plurals>
-  <string name="edit">Edytuj</string>
-  <string name="delete">Usuń</string>
-  <string name="statistic">Statystyka</string>
-  <!-- Share -->
-  <string name="share">Udostepnij</string>
-  <string name="dispersion_pattern">Wzorzec dyspersji</string>
-  <string name="sharing_failed">Udostępnienie nie powiodło się!</string>
-  <!-- Export -->
-  <string name="send_exported">Wyślij eksportowane dane</string>
-  <string name="exporting_failed">Eksport nie powiódł się!</string>
-  <!-- New bow -->
-  <string name="add_bow">Dodaj łuk</string>
-  <string name="name">Imię</string>
-  <string name="bow_type">Typ łuku</string>
-  <string name="properties">Ustawienia</string>
-  <string name="brand">Marka</string>
-  <string name="size">Rozmiar</string>
-  <string name="description">Opis</string>
-  <string name="height">Odległość cięciwy od łuczyska</string>
-  <string name="tiller">Długość naciągu</string>
-  <string name="sight_settings">Ustawienia celownika</string>
-  <string name="add">Dodaj</string>
-  <string name="take_picture">Zrób zdjęcie</string>
-  <string name="pick_from_gallery">Wybierz zdjęcie z galerii</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Dodaj strzałę</string>
-  <string name="length">Długość</string>
-  <string name="spine">Spin</string>
-  <string name="weight">Masa</string>
-  <string name="vanes">Lotki</string>
-  <string name="nock">Nasadka</string>
-  <string name="material">Materiał</string>
-  <!-- New round -->
-  <string name="title">Tytuł</string>
-  <string name="outdoor">Otwarte</string>
-  <string name="indoor">Halowe</string>
-  <string name="distance">Odległość</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d koniec</item>
-    <item quantity="few">%d końce</item>
-    <item quantity="many">%d ends</item>
-    <item quantity="other">%d końców</item>
-  </plurals>
-  <string name="with">z</string>
-  <plurals name="arrow">
-    <item quantity="one">%d strzała</item>
-    <item quantity="few">%d strzały</item>
-    <item quantity="many">%d arrows</item>
-    <item quantity="other">%d strzał</item>
-  </plurals>
-  <string name="target_face">Rodzaj celu</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Tabela wyników</string>
-  <string name="arrows">Strzały</string>
-  <string name="sum">Suma</string>
-  <string name="carry">Nieść</string>
-  <string name="action_print">Drukuj</string>
-  <string name="average">Średnia</string>
-  <!-- Input mode -->
-  <string name="comment">Skomentuj</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Wybierz plik</string>
-  <string name="dir_not_created">Nie można utworzyć katalogu!</string>
-  <string name="import_failed">Importowanie nie powiodło się!</string>
-  <string name="file_not_found">Plik nie znaleziony!</string>
-  <string name="failed_reading_file">Błąd odczytu pliku!</string>
-  <!-- Donate -->
-  <string name="donate_2">Hamburger dla autora</string>
-  <string name="donate_5">Kebab dla autora</string>
-  <string name="donate_10">Duża pizza dla autora</string>
-  <string name="donate_20">Galonik paliwa dla autora</string>
-  <string name="donation_thank">Dziękuję za wsparcie!</string>
-  <string name="donate_text" formatted="false">Kwoty zawierają podatek VAT oraz 30% opłatę Gooogle.  Alternatywnie datki można przekazywać na konto PayPal dreier.florian@gmail.com .</string>
-  <!-- Timer -->
-  <string name="timer">Zegar</string>
-  <string name="touch_to_start">Dotknij, aby rozpocząć</string>
-  <string name="preparation">Przygotuj się</string>
-  <string name="shooting">Strzelanie</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Czas strzelania</string>
-  <string name="timer_waiting_time">Czas przygotowania</string>
-  <string name="timer_warning_time">Czas rozgrzewki</string>
-  <string name="timer_sound">Dźwięk</string>
-  <string name="timer_vibrate">Wibracje</string>
-  <!-- Settings -->
-  <string name="backup_action">Kopia zapasowa</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Ekspotuj jako CSV</string>
-  <string name="licences">Licencje Open Source</string>
-  <string name="licences_summary">Informacje prawne do licencji</string>
-  <string name="version">Wersja %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekunda</item>
-    <item quantity="few">%d sekundy</item>
-    <item quantity="many">%d seconds</item>
-    <item quantity="other">%d sekund</item>
-  </plurals>
-  <string name="info">Informacje</string>
-  <string name="data">Dane</string>
-  <string name="weather">Pogoda</string>
-  <string name="environment">Środowisko</string>
-  <string name="wind_speed">Prędkość wiatru</string>
-  <string name="wind_direction">Kierunek wiatru</string>
-  <string name="sight_setting_removed">Ustawienie celownika usunięte!</string>
-  <string name="metric">Metryczne</string>
-  <string name="imperial">Imperialne</string>
-  <string name="undo">Cofnij</string>
-  <string name="standard_rounds">Rundy standardowe</string>
-  <string name="expand_collapse">Rozwiń/Zwiń</string>
-  <string name="new_round_template">Nowy Szablon</string>
-  <string name="arrow_numbers">Numery strzał</string>
-  <string name="round_removed">Runda usunięta!</string>
-  <string name="custom_round">Własna runda</string>
-  <string name="filter">Filtr</string>
-  <string name="club">Klub</string>
-  <string name="target">Cel</string>
-  <string name="standard_round">Runda standardowa</string>
-  <string name="use_as_template">Użyć jako szablon?</string>
-  <string name="create_copy">To jest runda standardowa! \nCzy chcesz utworzyć kopię, aby ją edytować?</string>
-  <string name="practice">Ćwiczenia</string>
-  <string name="edit_training">Edytuj trening</string>
-  <string name="edit_standard_round">Edytuj rundę standardową</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d skasowana strzała</item>
-    <item quantity="few">%d skasowane strzały</item>
-    <item quantity="many">%d arrows deleted</item>
-    <item quantity="other">%d skasowanych strzał</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d skasowany łuk</item>
-    <item quantity="few">%d skasowane łuki</item>
-    <item quantity="many">%d bows deleted</item>
-    <item quantity="other">%d skasowanych łuków</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d skasowany trening</item>
-    <item quantity="few">%d skasowane treningi</item>
-    <item quantity="many">%d trainings deleted</item>
-    <item quantity="other">%d skasowanych treningów</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">Usunięto %d koniec</item>
-    <item quantity="few">Usunięto %d końce</item>
-    <item quantity="many">%d ends deleted</item>
-    <item quantity="other">Usunięto %d końców</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Runda %d</item>
-    <item quantity="few">Runda %d</item>
-    <item quantity="many">Round %d</item>
-    <item quantity="other">Runda %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">Wybrano %d rundę</item>
-    <item quantity="few">Wybrano %d rundy</item>
-    <item quantity="many">%d rounds selected</item>
-    <item quantity="other">Wybrano %d rund</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">Usunięto %d rundę</item>
-    <item quantity="few">Usunięto %d rundy</item>
-    <item quantity="many">%d rounds deleted</item>
-    <item quantity="other">Usunięto %d rund</item>
-  </plurals>
-  <string name="date">Data</string>
-  <string name="edit_round">Edytuj Rundę</string>
-  <string name="draw_weight">Siła naciągu</string>
-  <string name="sight">Celownik</string>
-  <string name="limbs">Ramiona</string>
-  <string name="my_bow">Mój łuk</string>
-  <string name="my_arrow">Moje strzały</string>
-  <string name="tip_weight">Ciężar grotu</string>
-  <string name="arrow_ranking">Ranking strzał</string>
-  <string name="arrow_x_of_set_of_arrows">Strzała %1$s z %2$s</string>
-  <string name="display">Wyświetl</string>
-  <string name="print">Drukuj</string>
-  <string name="table">Tabela</string>
-  <string name="comments">Komentarz</string>
-  <string name="show_points_colored">Pokaż kolorowe punkty</string>
-  <string name="stabilizer">Stabilizator</string>
-  <string name="clicker">Klickier</string>
-  <string name="arrow_number_x">Strzała numer %s</string>
-  <string name="training_with_standard_round">Trening z Rundą Standardową</string>
-  <string name="free_training">Trening Swobodny</string>
-  <string name="competition">Zawody</string>
-  <string name="about">O aplikacji</string>
-  <string name="general">Ogólne</string>
-  <string name="contribute">Wesprzyj</string>
-  <string name="connect">Skontaktuj się</string>
-  <string name="special_thanks_to">Specjalne podziękowania dla</string>
-  <string name="all_translators">Wszystkich, którzy pomogli w tłumaczeniu aplikacji!</string>
-  <string name="all_beta_testers">Wszystkich, którzy dołączyli do grupy beta testerów, dzięki czemu ciągle pomagają ulepszyć aplikację.</string>
-  <string name="test_beta">Pomóż testować najnowszą wersję beta</string>
-  <string name="join_on_google_plus">Dołącz do nas na Google+</string>
-  <string name="share_with_friends">Podziel się ze znajomymi</string>
-  <string name="donate">Wesprzyj</string>
-  <string name="donate_via_paypal">Wesprzyj przez PayPal</string>
-  <string name="translate_crowdin">Tłumacz na Crowdin</string>
-  <string name="network_linkedin">Nawiąż kontakt na LinkedIn</string>
-  <string name="search">Szukaj</string>
-  <string name="us">USA</string>
-  <string name="show_shots_training">Pełen trening</string>
-  <string name="show_shots_round">Aktualna runda</string>
-  <string name="show_shots_end">Aktualny koniec</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Data urodzenia</string>
-  <string name="first_name">Imię</string>
-  <string name="last_name">Nazwisko</string>
-  <string name="age">Wiek</string>
-  <string name="show_signature">Podpis</string>
-  <string name="archer">Łucznik</string>
-  <string name="hits">Trafienia</string>
-  <string name="misses">Pudła</string>
-  <string name="new_end">Nowy koniec</string>
-  <string name="distribution">Rozkład</string>
-  <string name="count">Ilość</string>
-  <string name="diameter">Średnica</string>
-  <string name="input">Wprowadzanie danych</string>
-  <string name="target_zoom">Przybliżenie celu</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Skalowanie średnicy strzały</string>
-  <string name="timestamp">Data/czas</string>
-  <string name="change_target_face">Zmień rodzaj celu</string>
-  <string name="your_first_training">Twój pierwszy trening</string>
-  <string name="grouping">Grupowanie</string>
-  <string name="show_clusters">Skupiska</string>
-  <string name="first_training_description">Kliknij znak plus, aby rozpocząć nowy trening.</string>
-  <string name="show_average">Średnia</string>
-  <string name="show_none">Brak</string>
-  <string name="left_handed">Leworęczny</string>
-  <string name="right_handed">Praworęczny</string>
-  <string name="keyboard">Klawiatura</string>
-  <string name="backup_drive_desc">Utworzenie kopii zapasowej twoich danych umożliwi Ci odtworzenie wszystkich Twoich treningów w razie gdybyś zgubił lub zmienił swój telefon.</string>
-  <string name="backup_now">Utwórz kopię zapasową teraz</string>
-  <string name="last_backup">Ostatnia kopia zapasowa: %s</string>
-  <string name="recent_backups">Ostatnie kopie zapasowe</string>
-  <string name="dialog_restore_title">Przywróć poprzednią wersję</string>
-  <string name="restore_desc">Odtwarzanie danych nadpisze wszystkie obecne dane danymi z kopii zapasowej.</string>
-  <string name="backup_details">Szczegóły kopii zapasowej</string>
-  <string name="restore">Odtwórz</string>
-  <string name="backup_location">Lokalizacja kopii zapasowej</string>
-  <string name="internal_storage">Pamięć wewnętrzna</string>
-  <string name="automatic_backup">Automatyczna kopia zapasowa</string>
-  <string name="restoring">Przywracanie kopii zapasowej…</string>
-  <string name="restore_failed">Przywracanie nieudane</string>
-  <string name="delete_failed">Usuwanie nieudane</string>
-  <string name="backup_restore_desc">Kopia zapasowa i przywracanie danych</string>
-  <string name="exporting">Eksportowanie…</string>
-  <string name="loading_backups_failed">Odczytanie kopii zapasowej nie powiodło się!</string>
-  <string name="external_storage">Pamięć zewnętrzna</string>
-  <string name="backup_interval">Harmonogram kopii zapasowych</string>
-  <string name="daily">Dziennie</string>
-  <string name="weekly">Tygodniowo</string>
-  <string name="monthly">Miesięcznie</string>
-  <string name="connection_failed">Połączenie nieudane!</string>
-  <string name="shooting_indoor">Halowe</string>
-  <string name="bow_rest_vertical_position">Pozycja pionowa</string>
-  <string name="bow_rest">Podstawka</string>
-  <string name="bow_rest_horizontal_position">Pozycja pozioma</string>
-  <string name="bow_cam_settings">Ustawienia aparatu</string>
-  <string name="bow_letoff_weight">Siła odpuszczenia</string>
-  <string name="bow_nocking_point">Siodełko</string>
-  <string name="bow_string">Cięciwa</string>
-  <string name="bow_scope_magnification">Powiększenie celownika</string>
-  <string name="bow_rest_stiffness">Sztywność</string>
-  <string name="bow_button">Przycisk</string>
-  <string name="more_fields">Więcej pól</string>
-  <string name="recently_used">Ostatnio użyte</string>
-  <string name="intro_title_track_training_progress">Zapomnij o papierowych tabelkach!</string>
-  <string name="intro_description_track_training_progress">Dzięki dokładnym wykresom trafień\nmożesz uzyskać więcej przydatnych spostrzeżeń\nz wyników Twojego treningu.</string>
-  <string name="intro_title_everything_in_one_place">Wszystko czego potrzebujesz\nw jednym miejscu</string>
-  <string name="intro_description_everything_in_one_place">Włącznie z zarządzaniem\nłukami, strzałami i celownikiem,\nczasomierzem łuczniczym, statystykami i\n wiele wiele więcej…</string>
-  <string name="average_arrow_score_per_end">Średnia punktacja strzały na koniec</string>
-  <string name="show_end">Pokaż koniec</string>
-  <string name="show_round">Pokaż rundę</string>
-  <string name="show_training">Pokaż trening</string>
-  <string name="summary">Podsumowanie</string>
-  <string name="end">Koniec</string>
-  <string name="average_of">Średnia z</string>
-  <string name="displayed_shots">Pokaż poprzednie trafienia</string>
-  <string name="invalid_decimal_number">Nieprawidłowa liczba dziesiętna</string>
-  <string name="not_within_expected_range_mm">Poza oczekiwanym zakresem od 1 do 20 mm</string>
-  <string name="not_within_expected_range_inch">Poza oczekiwanym zakresem od 0 do 1 cala</string>
-  <string name="next_round">Następna runda</string>
-  <string name="previous_round">Poprzednia runda</string>
-  <string name="overview">Przegląd</string>
-  <string name="score">Wynik</string>
-  <string name="show_reached_score">Pokaż osiągnięty wynik</string>
-  <string name="show_total_score">Pokaż całkowity wynik</string>
-  <string name="show_percentage">Pokaż procenty</string>
-  <string name="show_arrow_average">Pokaż średnią strzały</string>
-  <string name="image_deleted">Obraz usunięty</string>
-  <string name="delete_image">Usunąć obraz?</string>
-  <string name="keyboard_type">Rodzaj klawiatury</string>
-  <string name="keyboard_enabled">Klawiatura włączona</string>
-  <string name="sort_shots">Posortuj strzały</string>
-  <string name="sort_shots_for_spots">Posortuj strzały dla stref celów</string>
-  <string name="target_captain">Sędzia</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Koniec %1$d/%2$d</string>
-  <string name="round_x_of_y">Runda %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opcje</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Poprzednie</string>
+    <string name="next">Następne</string>
+    <string name="save">Zapisz</string>
+    <string name="custom">Niestandardowe</string>
+    <string name="training">Trening</string>
+    <string name="bow">Łuk</string>
+    <string name="arrow">Strzała</string>
+    <string name="round">Runda</string>
+    <string name="points">Punkty</string>
+    <string name="passe">Seria</string>
+    <!-- Overview -->
+    <string name="new_training">Nowy trening</string>
+    <string name="new_bow">Nowy łuk</string>
+    <string name="new_arrow">Nowa strzała</string>
+    <string name="new_round">Nowa runda</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d wybrany trening</item>
+        <item quantity="few">%d wybrane treningi</item>
+        <item quantity="many">%d trainings selected</item>
+        <item quantity="other">%d wybranych treningów</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d wybrany łuk</item>
+        <item quantity="few">%d wybrane łuki</item>
+        <item quantity="many">%d bows selected</item>
+        <item quantity="other">%d wybranych łuków</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d wybrana strzała</item>
+        <item quantity="few">%d wybrane strzały</item>
+        <item quantity="many">%d arrows selected</item>
+        <item quantity="other">%d wybranych strzał</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d wybrana seria</item>
+        <item quantity="few">%d wybrane końce</item>
+        <item quantity="many">%d ends selected</item>
+        <item quantity="other">%d wybranych serii</item>
+    </plurals>
+    <string name="edit">Edytuj</string>
+    <string name="delete">Usuń</string>
+    <string name="statistic">Statystyka</string>
+    <!-- Share -->
+    <string name="share">Udostepnij</string>
+    <string name="dispersion_pattern">Wzorzec dyspersji</string>
+    <string name="sharing_failed">Udostępnienie nie powiodło się!</string>
+    <!-- Export -->
+    <string name="send_exported">Wyślij eksportowane dane</string>
+    <string name="exporting_failed">Eksport nie powiódł się!</string>
+    <!-- New bow -->
+    <string name="add_bow">Dodaj łuk</string>
+    <string name="name">Imię</string>
+    <string name="bow_type">Typ łuku</string>
+    <string name="properties">Ustawienia</string>
+    <string name="brand">Marka</string>
+    <string name="size">Rozmiar</string>
+    <string name="description">Opis</string>
+    <string name="height">Odległość cięciwy od łuczyska</string>
+    <string name="tiller">Długość naciągu</string>
+    <string name="sight_settings">Ustawienia celownika</string>
+    <string name="add">Dodaj</string>
+    <string name="take_picture">Zrób zdjęcie</string>
+    <string name="pick_from_gallery">Wybierz zdjęcie z galerii</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Dodaj strzałę</string>
+    <string name="length">Długość</string>
+    <string name="spine">Spin</string>
+    <string name="weight">Masa</string>
+    <string name="vanes">Lotki</string>
+    <string name="nock">Nasadka</string>
+    <string name="material">Materiał</string>
+    <!-- New round -->
+    <string name="title">Tytuł</string>
+    <string name="outdoor">Otwarte</string>
+    <string name="indoor">Halowe</string>
+    <string name="distance">Odległość</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d koniec</item>
+        <item quantity="few">%d końce</item>
+        <item quantity="many">%d ends</item>
+        <item quantity="other">%d serii</item>
+    </plurals>
+    <string name="with">z</string>
+    <plurals name="arrow">
+        <item quantity="one">%d strzała</item>
+        <item quantity="few">%d strzały</item>
+        <item quantity="many">%d arrows</item>
+        <item quantity="other">%d strzał</item>
+    </plurals>
+    <string name="target_face">Rodzaj celu</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Tabela wyników</string>
+    <string name="arrows">Strzały</string>
+    <string name="sum">Suma</string>
+    <string name="carry">Nieść</string>
+    <string name="action_print">Drukuj</string>
+    <string name="average">Średnia</string>
+    <!-- Input mode -->
+    <string name="comment">Skomentuj</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Wybierz plik</string>
+    <string name="dir_not_created">Nie można utworzyć katalogu!</string>
+    <string name="import_failed">Importowanie nie powiodło się!</string>
+    <string name="file_not_found">Plik nie znaleziony!</string>
+    <string name="failed_reading_file">Błąd odczytu pliku!</string>
+    <!-- Donate -->
+    <string name="donate_2">Hamburger dla autora</string>
+    <string name="donate_5">Kebab dla autora</string>
+    <string name="donate_10">Duża pizza dla autora</string>
+    <string name="donate_20">Galonik paliwa dla autora</string>
+    <string name="donation_thank">Dziękuję za wsparcie!</string>
+    <string name="donate_text" formatted="false">Kwoty zawierają podatek VAT oraz 30% opłatę Gooogle.  Alternatywnie datki można przekazywać na konto PayPal dreier.florian@gmail.com .</string>
+    <!-- Timer -->
+    <string name="timer">Zegar</string>
+    <string name="touch_to_start">Dotknij, aby rozpocząć</string>
+    <string name="preparation">Przygotuj się</string>
+    <string name="shooting">Strzelanie</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Czas strzelania</string>
+    <string name="timer_waiting_time">Czas przygotowania</string>
+    <string name="timer_warning_time">Czas rozgrzewki</string>
+    <string name="timer_sound">Dźwięk</string>
+    <string name="timer_vibrate">Wibracje</string>
+    <!-- Settings -->
+    <string name="backup_action">Kopia zapasowa</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Ekspotuj jako CSV</string>
+    <string name="licences">Licencje Open Source</string>
+    <string name="licences_summary">Informacje prawne do licencji</string>
+    <string name="version">Wersja %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekunda</item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d sekund</item>
+    </plurals>
+    <string name="info">Informacje</string>
+    <string name="data">Dane</string>
+    <string name="weather">Pogoda</string>
+    <string name="environment">Środowisko</string>
+    <string name="wind_speed">Prędkość wiatru</string>
+    <string name="wind_direction">Kierunek wiatru</string>
+    <string name="sight_setting_removed">Ustawienie celownika usunięte!</string>
+    <string name="metric">Metryczne</string>
+    <string name="imperial">Imperialne</string>
+    <string name="undo">Cofnij</string>
+    <string name="standard_rounds">Rundy standardowe</string>
+    <string name="expand_collapse">Rozwiń/Zwiń</string>
+    <string name="new_round_template">Nowy Szablon</string>
+    <string name="arrow_numbers">Numery strzał</string>
+    <string name="round_removed">Runda usunięta!</string>
+    <string name="custom_round">Własna runda</string>
+    <string name="filter">Filtr</string>
+    <string name="club">Klub</string>
+    <string name="target">Cel</string>
+    <string name="standard_round">Runda standardowa</string>
+    <string name="use_as_template">Użyć jako szablon?</string>
+    <string name="create_copy">To jest runda standardowa! \nCzy chcesz utworzyć kopię, aby ją edytować?</string>
+    <string name="practice">Ćwiczenia</string>
+    <string name="edit_training">Edytuj trening</string>
+    <string name="edit_standard_round">Edytuj rundę standardową</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d skasowana strzała</item>
+        <item quantity="few">%d skasowane strzały</item>
+        <item quantity="many">%d arrows deleted</item>
+        <item quantity="other">%d skasowanych strzał</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d skasowany łuk</item>
+        <item quantity="few">%d skasowane łuki</item>
+        <item quantity="many">%d bows deleted</item>
+        <item quantity="other">%d skasowanych łuków</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d skasowany trening</item>
+        <item quantity="few">%d skasowane treningi</item>
+        <item quantity="many">%d trainings deleted</item>
+        <item quantity="other">%d skasowanych treningów</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">Usunięto %d koniec</item>
+        <item quantity="few">Usunięto %d końce</item>
+        <item quantity="many">%d ends deleted</item>
+        <item quantity="other">Usunięto %d serii</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Runda %d</item>
+        <item quantity="few">Runda %d</item>
+        <item quantity="many">Round %d</item>
+        <item quantity="other">Runda %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">Wybrano %d rundę</item>
+        <item quantity="few">Wybrano %d rundy</item>
+        <item quantity="many">%d rounds selected</item>
+        <item quantity="other">Wybrano %d rund</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">Usunięto %d rundę</item>
+        <item quantity="few">Usunięto %d rundy</item>
+        <item quantity="many">%d rounds deleted</item>
+        <item quantity="other">Usunięto %d rund</item>
+    </plurals>
+    <string name="date">Data</string>
+    <string name="edit_round">Edytuj Rundę</string>
+    <string name="draw_weight">Siła naciągu</string>
+    <string name="sight">Celownik</string>
+    <string name="limbs">Ramiona</string>
+    <string name="my_bow">Mój łuk</string>
+    <string name="my_arrow">Moje strzały</string>
+    <string name="tip_weight">Ciężar grotu</string>
+    <string name="arrow_ranking">Ranking strzał</string>
+    <string name="arrow_x_of_set_of_arrows">Strzała %1$s z %2$s</string>
+    <string name="display">Wyświetl</string>
+    <string name="print">Drukuj</string>
+    <string name="table">Tabela</string>
+    <string name="comments">Komentarz</string>
+    <string name="show_points_colored">Pokaż kolorowe punkty</string>
+    <string name="stabilizer">Stabilizator</string>
+    <string name="clicker">Klickier</string>
+    <string name="arrow_number_x">Strzała numer %s</string>
+    <string name="training_with_standard_round">Trening z Rundą Standardową</string>
+    <string name="free_training">Trening Swobodny</string>
+    <string name="competition">Zawody</string>
+    <string name="about">O aplikacji</string>
+    <string name="general">Ogólne</string>
+    <string name="contribute">Wesprzyj</string>
+    <string name="connect">Skontaktuj się</string>
+    <string name="special_thanks_to">Specjalne podziękowania dla</string>
+    <string name="all_translators">Wszystkich, którzy pomogli w tłumaczeniu aplikacji!</string>
+    <string name="all_beta_testers">Wszystkich, którzy dołączyli do grupy beta testerów, dzięki czemu ciągle pomagają ulepszyć aplikację.</string>
+    <string name="test_beta">Pomóż testować najnowszą wersję beta</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Podziel się ze znajomymi</string>
+    <string name="donate">Wesprzyj</string>
+    <string name="donate_via_paypal">Wesprzyj przez PayPal</string>
+    <string name="translate_crowdin">Tłumacz na Crowdin</string>
+    <string name="network_linkedin">Nawiąż kontakt na LinkedIn</string>
+    <string name="search">Szukaj</string>
+    <string name="us">USA</string>
+    <string name="show_shots_training">Pełen trening</string>
+    <string name="show_shots_round">Aktualna runda</string>
+    <string name="show_shots_end">Aktualny koniec</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Data urodzenia</string>
+    <string name="first_name">Imię</string>
+    <string name="last_name">Nazwisko</string>
+    <string name="age">Wiek</string>
+    <string name="show_signature">Podpis</string>
+    <string name="archer">Łucznik</string>
+    <string name="hits">Trafienia</string>
+    <string name="misses">Pudła</string>
+    <string name="new_end">Nowy koniec</string>
+    <string name="distribution">Rozkład</string>
+    <string name="count">Ilość</string>
+    <string name="diameter">Średnica</string>
+    <string name="input">Wprowadzanie danych</string>
+    <string name="target_zoom">Przybliżenie celu</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Skalowanie średnicy strzały</string>
+    <string name="timestamp">Data/czas</string>
+    <string name="change_target_face">Zmień rodzaj celu</string>
+    <string name="your_first_training">Twój pierwszy trening</string>
+    <string name="grouping">Grupowanie</string>
+    <string name="show_clusters">Skupiska</string>
+    <string name="first_training_description">Kliknij znak plus, aby rozpocząć nowy trening.</string>
+    <string name="show_average">Średnia</string>
+    <string name="show_none">Brak</string>
+    <string name="left_handed">Leworęczny</string>
+    <string name="right_handed">Praworęczny</string>
+    <string name="keyboard">Klawiatura</string>
+    <string name="backup_drive_desc">Utworzenie kopii zapasowej twoich danych umożliwi Ci odtworzenie wszystkich Twoich treningów w razie gdybyś zgubił lub zmienił swój telefon.</string>
+    <string name="backup_now">Utwórz kopię zapasową teraz</string>
+    <string name="last_backup">Ostatnia kopia zapasowa: %s</string>
+    <string name="recent_backups">Ostatnie kopie zapasowe</string>
+    <string name="dialog_restore_title">Przywróć poprzednią wersję</string>
+    <string name="restore_desc">Odtwarzanie danych nadpisze wszystkie obecne dane danymi z kopii zapasowej.</string>
+    <string name="backup_details">Szczegóły kopii zapasowej</string>
+    <string name="restore">Odtwórz</string>
+    <string name="backup_location">Lokalizacja kopii zapasowej</string>
+    <string name="internal_storage">Pamięć wewnętrzna</string>
+    <string name="automatic_backup">Automatyczna kopia zapasowa</string>
+    <string name="restoring">Przywracanie kopii zapasowej…</string>
+    <string name="restore_failed">Przywracanie nieudane</string>
+    <string name="delete_failed">Usuwanie nieudane</string>
+    <string name="backup_restore_desc">Kopia zapasowa i przywracanie danych</string>
+    <string name="exporting">Eksportowanie…</string>
+    <string name="loading_backups_failed">Odczytanie kopii zapasowej nie powiodło się!</string>
+    <string name="external_storage">Pamięć zewnętrzna</string>
+    <string name="backup_interval">Harmonogram kopii zapasowych</string>
+    <string name="daily">Dziennie</string>
+    <string name="weekly">Tygodniowo</string>
+    <string name="monthly">Miesięcznie</string>
+    <string name="connection_failed">Połączenie nieudane!</string>
+    <string name="shooting_indoor">Halowe</string>
+    <string name="bow_rest_vertical_position">Pozycja pionowa</string>
+    <string name="bow_rest">Podstawka</string>
+    <string name="bow_rest_horizontal_position">Pozycja pozioma</string>
+    <string name="bow_cam_settings">Ustawienia aparatu</string>
+    <string name="bow_letoff_weight">Siła odpuszczenia</string>
+    <string name="bow_nocking_point">Siodełko</string>
+    <string name="bow_string">Cięciwa</string>
+    <string name="bow_scope_magnification">Powiększenie celownika</string>
+    <string name="bow_rest_stiffness">Sztywność</string>
+    <string name="bow_button">Przycisk</string>
+    <string name="more_fields">Więcej pól</string>
+    <string name="recently_used">Ostatnio użyte</string>
+    <string name="intro_title_track_training_progress">Zapomnij o papierowych tabelkach!</string>
+    <string name="intro_description_track_training_progress">Dzięki dokładnym wykresom trafień\nmożesz uzyskać więcej przydatnych spostrzeżeń\nz wyników Twojego treningu.</string>
+    <string name="intro_title_everything_in_one_place">Wszystko czego potrzebujesz\nw jednym miejscu</string>
+    <string name="intro_description_everything_in_one_place">Włącznie z zarządzaniem\nłukami, strzałami i celownikiem,\nczasomierzem łuczniczym, statystykami i\n wiele wiele więcej…</string>
+    <string name="average_arrow_score_per_end">Średnia punktacja strzały na koniec</string>
+    <string name="show_end">Pokaż koniec</string>
+    <string name="show_round">Pokaż rundę</string>
+    <string name="show_training">Pokaż trening</string>
+    <string name="summary">Podsumowanie</string>
+    <string name="end">Koniec</string>
+    <string name="average_of">Średnia z</string>
+    <string name="displayed_shots">Pokaż poprzednie trafienia</string>
+    <string name="invalid_decimal_number">Nieprawidłowa liczba dziesiętna</string>
+    <string name="not_within_expected_range_mm">Poza oczekiwanym zakresem od 1 do 20 mm</string>
+    <string name="not_within_expected_range_inch">Poza oczekiwanym zakresem od 0 do 1 cala</string>
+    <string name="next_round">Następna runda</string>
+    <string name="previous_round">Poprzednia runda</string>
+    <string name="overview">Przegląd</string>
+    <string name="score">Wynik</string>
+    <string name="show_reached_score">Pokaż osiągnięty wynik</string>
+    <string name="show_total_score">Pokaż całkowity wynik</string>
+    <string name="show_percentage">Pokaż procenty</string>
+    <string name="show_arrow_average">Pokaż średnią strzały</string>
+    <string name="image_deleted">Obraz usunięty</string>
+    <string name="delete_image">Usunąć obraz?</string>
+    <string name="keyboard_type">Rodzaj klawiatury</string>
+    <string name="keyboard_enabled">Klawiatura włączona</string>
+    <string name="sort_shots">Posortuj strzały</string>
+    <string name="sort_shots_for_spots">Posortuj strzały dla stref celów</string>
+    <string name="target_captain">Sędzia</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Koniec %1$d/%2$d</string>
+    <string name="round_x_of_y">Runda %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5be5cc1a1..b2bde278a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opções</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Anterior</string>
-  <string name="next">Próximo</string>
-  <string name="save">Salvar</string>
-  <string name="custom">Personalizar</string>
-  <string name="training">Treinamento</string>
-  <string name="bow">Arco</string>
-  <string name="arrow">Flecha</string>
-  <string name="round">Partida</string>
-  <string name="points">Pontos</string>
-  <string name="passe">Série</string>
-  <!-- Overview -->
-  <string name="new_training">Novo treino</string>
-  <string name="new_bow">Novo arco</string>
-  <string name="new_arrow">Nova flecha</string>
-  <string name="new_round">Nova partida</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d treino selecionado</item>
-    <item quantity="other">%d treinamentos selecionados</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d arco selecionado</item>
-    <item quantity="other">%d arcos selecionados</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d flecha selecionada</item>
-    <item quantity="other">%d flechas selecionadas</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d série selecionada</item>
-    <item quantity="other">%d séries selecionadas</item>
-  </plurals>
-  <string name="edit">Editar</string>
-  <string name="delete">Apagar</string>
-  <string name="statistic">Estatística</string>
-  <!-- Share -->
-  <string name="share">Compartilhar</string>
-  <string name="dispersion_pattern">Padrão de dispersão</string>
-  <string name="sharing_failed">Falha ao compartilhar!</string>
-  <!-- Export -->
-  <string name="send_exported">Enviar dados exportados</string>
-  <string name="exporting_failed">Falha na exportação!</string>
-  <!-- New bow -->
-  <string name="add_bow">Adicionar arco</string>
-  <string name="name">Nome</string>
-  <string name="bow_type">Tipo de arco</string>
-  <string name="properties">Propriedades</string>
-  <string name="brand">Marca</string>
-  <string name="size">Tamanho</string>
-  <string name="description">Descrição</string>
-  <string name="height">Medida do brace</string>
-  <string name="tiller">Medida do tiller</string>
-  <string name="sight_settings">Ajustes da mira</string>
-  <string name="add">Adicionar</string>
-  <string name="take_picture">Tirar uma foto</string>
-  <string name="pick_from_gallery">Selecione uma imagem da Galeria</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Adicionar flecha</string>
-  <string name="length">Comprimento</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Peso</string>
-  <string name="vanes">Penas</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Título</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distância</string>
-  <string name="format">Formato</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d série</item>
-    <item quantity="other">%d séries</item>
-  </plurals>
-  <string name="with">de</string>
-  <plurals name="arrow">
-    <item quantity="one">%d flecha</item>
-    <item quantity="other">%d flechas</item>
-  </plurals>
-  <string name="target_face">Face do alvo</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Painel de pontuação</string>
-  <string name="arrows">Flechas</string>
-  <string name="sum">Soma</string>
-  <string name="carry">Acumulado</string>
-  <string name="action_print">Imprimir</string>
-  <string name="average">Média</string>
-  <!-- Input mode -->
-  <string name="comment">Comentários</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Selecione um arquivo</string>
-  <string name="dir_not_created">Diretório não pôde ser criado!</string>
-  <string name="import_failed">Falha na importação!</string>
-  <string name="file_not_found">Arquivo não encontrado!</string>
-  <string name="failed_reading_file">Falha na leitura do arquivo!</string>
-  <!-- Donate -->
-  <string name="donate_2">Doe-me um hamburger</string>
-  <string name="donate_5">Doe-me um kebab</string>
-  <string name="donate_10">Doe-me uma pizza grande</string>
-  <string name="donate_20">Doe-me combustível</string>
-  <string name="donation_thank">Obrigado pelo seu apoio!</string>
-  <string name="donate_text" formatted="false">Os valores incluem impostos e 30% de taxas para o Google. Como alternativa, você pode doar livremente na conta PayPal dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Cronômetro</string>
-  <string name="touch_to_start">Toque para começar</string>
-  <string name="preparation">Prepare-se</string>
-  <string name="shooting">Atirar</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Tempo de tiro</string>
-  <string name="timer_waiting_time">Tempo de preparo</string>
-  <string name="timer_warning_time">Tempo de aviso</string>
-  <string name="timer_sound">Som</string>
-  <string name="timer_vibrate">Vibrar</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Importar</string>
-  <string name="exports_as_csv">Exporta como .csv</string>
-  <string name="licences">Licenças de código aberto</string>
-  <string name="licences_summary">Notas legais de Licenças</string>
-  <string name="version">Versão %s</string>
-  <plurals name="second">
-    <item quantity="one">%d segundos</item>
-    <item quantity="other">%d segundos</item>
-  </plurals>
-  <string name="info">Informação</string>
-  <string name="data">Dados</string>
-  <string name="weather">Clima</string>
-  <string name="environment">Ambiente</string>
-  <string name="wind_speed">Velocidade do vento</string>
-  <string name="wind_direction">Direção do vento</string>
-  <string name="sight_setting_removed">Configuração de mira excluída!</string>
-  <string name="metric">Métrico</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Desfazer</string>
-  <string name="standard_rounds">Partida padrão</string>
-  <string name="expand_collapse">Expandir/recolher</string>
-  <string name="new_round_template">Novo modelo</string>
-  <string name="arrow_numbers">Números de Flecha</string>
-  <string name="round_removed">Round removido!</string>
-  <string name="custom_round">Partida personalizada</string>
-  <string name="filter">Filtro</string>
-  <string name="club">Infantil</string>
-  <string name="target">Alvo</string>
-  <string name="standard_round">Partida padrão</string>
-  <string name="use_as_template">Usar como modelo?</string>
-  <string name="create_copy">Esse é um round padrão!\n Deseja criar uma cópia para editar?</string>
-  <string name="practice">Treinar</string>
-  <string name="edit_training">Editar o treino</string>
-  <string name="edit_standard_round">Editar Partida Padrão</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d flecha eliminada</item>
-    <item quantity="other">%d flechas apagadas</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d arco apagado</item>
-    <item quantity="other">%d arco apagado</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d treino apagado</item>
-    <item quantity="other">%d treinos apagados</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d série apagada</item>
-    <item quantity="other">%d entradas apagadas</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Partida %d</item>
-    <item quantity="other">Partida %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d rounds selecionado</item>
-    <item quantity="other">%d rounds selecionados</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round excluído</item>
-    <item quantity="other">%d rounds excluídos</item>
-  </plurals>
-  <string name="date">Data</string>
-  <string name="edit_round">Editar round</string>
-  <string name="draw_weight">Potência na puxada</string>
-  <string name="sight">Mira</string>
-  <string name="limbs">Lâminas</string>
-  <string name="my_bow">Meu arco</string>
-  <string name="my_arrow">Minhas flechas</string>
-  <string name="tip_weight">Peso das pontas</string>
-  <string name="arrow_ranking">Classificação da flecha</string>
-  <string name="arrow_x_of_set_of_arrows">Flecha %1$s de %2$s</string>
-  <string name="display">Mostrar</string>
-  <string name="print">Imprimir</string>
-  <string name="table">Tabela</string>
-  <string name="comments">Comentários</string>
-  <string name="show_points_colored">Mostrar pontos coloridos</string>
-  <string name="stabilizer">Estabilizador</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Flecha número %s</string>
-  <string name="training_with_standard_round">Treinamento com Standard Round</string>
-  <string name="free_training">Treino Livre</string>
-  <string name="competition">Competição</string>
-  <string name="about">Sobre</string>
-  <string name="general">Geral</string>
-  <string name="contribute">Contribua</string>
-  <string name="connect">Conectar</string>
-  <string name="special_thanks_to">Agradecimentos especiais para</string>
-  <string name="all_translators">Todos os caras, que ajudaram a traduzir o app!</string>
-  <string name="all_beta_testers">Todos os que se juntaram ao grupo de testadores beta e, portanto, ajudaram a melhorar continuamente o app.</string>
-  <string name="test_beta">Testar a versão beta mais recente</string>
-  <string name="join_on_google_plus">Junte-se a nós no Google+</string>
-  <string name="share_with_friends">Compartilhe com seus amigos</string>
-  <string name="donate">Faça uma doação</string>
-  <string name="donate_via_paypal">Doar via PayPal</string>
-  <string name="translate_crowdin">Traduza no Crowdin</string>
-  <string name="network_linkedin">Rede no LinkedIn</string>
-  <string name="search">Busca</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Treino Completo</string>
-  <string name="show_shots_round">Round atual</string>
-  <string name="show_shots_end">Série atual</string>
-  <string name="profile">Perfil	</string>
-  <string name="birthday">Data de nascimento</string>
-  <string name="first_name">Nome</string>
-  <string name="last_name">Sobrenome</string>
-  <string name="age">Idade</string>
-  <string name="show_signature">Assinatura</string>
-  <string name="archer">Arqueiro</string>
-  <string name="hits">Acertos</string>
-  <string name="misses">Erros</string>
-  <string name="new_end">Nova série</string>
-  <string name="distribution">Distribuição</string>
-  <string name="count">Contagem</string>
-  <string name="diameter">Diâmetro</string>
-  <string name="input">Entrada</string>
-  <string name="target_zoom">Nível de zoom do alvo</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Escala do diâmetro da flecha</string>
-  <string name="timestamp">Horário</string>
-  <string name="change_target_face">Mudar face do alvo</string>
-  <string name="your_first_training">Seu primeiro treino</string>
-  <string name="grouping">Agrupamento</string>
-  <string name="show_clusters">Grupos</string>
-  <string name="first_training_description">Toque no \"+\" para iniciar novo treinamento.</string>
-  <string name="show_average">Média</string>
-  <string name="show_none">Nenhum</string>
-  <string name="left_handed">Canhoto</string>
-  <string name="right_handed">Destro</string>
-  <string name="keyboard">Teclado</string>
-  <string name="backup_drive_desc">O backup permite recuperar todos os dados de treinamentos em caso de perda ou troca de telefone.</string>
-  <string name="backup_now">Fazer backup agora</string>
-  <string name="last_backup">Último backup: %s</string>
-  <string name="recent_backups">Backups recentes</string>
-  <string name="dialog_restore_title">Retornar à versão anterior</string>
-  <string name="restore_desc">O restauro do backup irá sobrescrever todos os dados existentes.</string>
-  <string name="backup_details">Detalhes do backup</string>
-  <string name="restore">Restaurar</string>
-  <string name="backup_location">Local do backup</string>
-  <string name="internal_storage">Armazenamento interno</string>
-  <string name="automatic_backup">Backup automático</string>
-  <string name="restoring">Restaurando o backup…</string>
-  <string name="restore_failed">Falha na restauração</string>
-  <string name="delete_failed">Falha ao excluir</string>
-  <string name="backup_restore_desc">Backup e restauro de dados do aplicativo</string>
-  <string name="exporting">Exportando…</string>
-  <string name="loading_backups_failed">Falha no carregamento dos backups!</string>
-  <string name="external_storage">Armazenamento externo</string>
-  <string name="backup_interval">Intervalo de backup</string>
-  <string name="daily">Diariamente</string>
-  <string name="weekly">Semanalmente</string>
-  <string name="monthly">Mensalmente</string>
-  <string name="connection_failed">Falha na conexão!</string>
-  <string name="shooting_indoor">Tiro indoor</string>
-  <string name="bow_rest_vertical_position">Posição vertical</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Posição horizontal</string>
-  <string name="bow_cam_settings">Configurações das roldanas</string>
-  <string name="bow_letoff_weight">Peso de let-off</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">Corda</string>
-  <string name="bow_scope_magnification">Amplificação da mira</string>
-  <string name="bow_rest_stiffness">Rigidez</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">Mais campos</string>
-  <string name="recently_used">Usado recentemente</string>
-  <string name="intro_title_track_training_progress">Esquecer planilhas de papel!</string>
-  <string name="intro_description_track_training_progress">Com a exibição precisa das flechas,\nvocê pode obter boas ideias\na partir dos dados de treinamento.</string>
-  <string name="intro_title_everything_in_one_place">Tudo o que você precisa\nem um único lugar</string>
-  <string name="intro_description_everything_in_one_place">Incluindo gerenciamento de arcos, flechas\ne miras, além de\ncronômetro, estatísticas \ne muito mais…</string>
-  <string name="average_arrow_score_per_end">Pontuação média de flecha por série</string>
-  <string name="show_end">Mostrar série</string>
-  <string name="show_round">Mostrar round</string>
-  <string name="show_training">Mostrar treinamento</string>
-  <string name="summary">Resumo</string>
-  <string name="end">Série</string>
-  <string name="average_of">Média de</string>
-  <string name="displayed_shots">Tiros a exibir</string>
-  <string name="invalid_decimal_number">Número decimal inválido</string>
-  <string name="not_within_expected_range_mm">Fora do intervalo válido de 1 a 20mm</string>
-  <string name="not_within_expected_range_inch">Fora do intervalo válido de 0 a 1 polegada</string>
-  <string name="next_round">Próximo round</string>
-  <string name="previous_round">Round anterior</string>
-  <string name="overview">Visão geral</string>
-  <string name="score">Pontuação</string>
-  <string name="show_reached_score">Mostrar pontuação alcançada</string>
-  <string name="show_total_score">Mostrar pontuação total</string>
-  <string name="show_percentage">Mostrar porcentagens</string>
-  <string name="show_arrow_average">Mostrar média da flecha</string>
-  <string name="image_deleted">Imagem excluída</string>
-  <string name="delete_image">Excluir imagem?</string>
-  <string name="keyboard_type">Tipo de teclado</string>
-  <string name="keyboard_enabled">Teclado habilitado</string>
-  <string name="sort_shots">Classificar tiros</string>
-  <string name="sort_shots_for_spots">Classificar tiros por faces de alvo</string>
-  <string name="target_captain">Capitão de alvos</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Série %1$d/%2$d</string>
-  <string name="round_x_of_y">Partida %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opções</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Anterior</string>
+    <string name="next">Próximo</string>
+    <string name="save">Salvar</string>
+    <string name="custom">Personalizar</string>
+    <string name="training">Treinamento</string>
+    <string name="bow">Arco</string>
+    <string name="arrow">Flecha</string>
+    <string name="round">Partida</string>
+    <string name="points">Pontos</string>
+    <string name="passe">Série</string>
+    <!-- Overview -->
+    <string name="new_training">Novo treino</string>
+    <string name="new_bow">Novo arco</string>
+    <string name="new_arrow">Nova flecha</string>
+    <string name="new_round">Nova partida</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d treino selecionado</item>
+        <item quantity="other">%d treinamentos selecionados</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d arco selecionado</item>
+        <item quantity="other">%d arcos selecionados</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d flecha selecionada</item>
+        <item quantity="other">%d flechas selecionadas</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d série selecionada</item>
+        <item quantity="other">%d séries selecionadas</item>
+    </plurals>
+    <string name="edit">Editar</string>
+    <string name="delete">Apagar</string>
+    <string name="statistic">Estatística</string>
+    <!-- Share -->
+    <string name="share">Compartilhar</string>
+    <string name="dispersion_pattern">Padrão de dispersão</string>
+    <string name="sharing_failed">Falha ao compartilhar!</string>
+    <!-- Export -->
+    <string name="send_exported">Enviar dados exportados</string>
+    <string name="exporting_failed">Falha na exportação!</string>
+    <!-- New bow -->
+    <string name="add_bow">Adicionar arco</string>
+    <string name="name">Nome</string>
+    <string name="bow_type">Tipo de arco</string>
+    <string name="properties">Propriedades</string>
+    <string name="brand">Marca</string>
+    <string name="size">Tamanho</string>
+    <string name="description">Descrição</string>
+    <string name="height">Medida do brace</string>
+    <string name="tiller">Medida do tiller</string>
+    <string name="sight_settings">Ajustes da mira</string>
+    <string name="add">Adicionar</string>
+    <string name="take_picture">Tirar uma foto</string>
+    <string name="pick_from_gallery">Selecione uma imagem da Galeria</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Adicionar flecha</string>
+    <string name="length">Comprimento</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Peso</string>
+    <string name="vanes">Penas</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Título</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distância</string>
+    <string name="format">Formato</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d série</item>
+        <item quantity="other">%d séries</item>
+    </plurals>
+    <string name="with">de</string>
+    <plurals name="arrow">
+        <item quantity="one">%d flecha</item>
+        <item quantity="other">%d flechas</item>
+    </plurals>
+    <string name="target_face">Face do alvo</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Painel de pontuação</string>
+    <string name="arrows">Flechas</string>
+    <string name="sum">Soma</string>
+    <string name="carry">Acumulado</string>
+    <string name="action_print">Imprimir</string>
+    <string name="average">Média</string>
+    <!-- Input mode -->
+    <string name="comment">Comentários</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Selecione um arquivo</string>
+    <string name="dir_not_created">Diretório não pôde ser criado!</string>
+    <string name="import_failed">Falha na importação!</string>
+    <string name="file_not_found">Arquivo não encontrado!</string>
+    <string name="failed_reading_file">Falha na leitura do arquivo!</string>
+    <!-- Donate -->
+    <string name="donate_2">Doe-me um hamburger</string>
+    <string name="donate_5">Doe-me um kebab</string>
+    <string name="donate_10">Doe-me uma pizza grande</string>
+    <string name="donate_20">Doe-me combustível</string>
+    <string name="donation_thank">Obrigado pelo seu apoio!</string>
+    <string name="donate_text" formatted="false">Os valores incluem impostos e 30% de taxas para o Google. Como alternativa, você pode doar livremente na conta PayPal dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Cronômetro</string>
+    <string name="touch_to_start">Toque para começar</string>
+    <string name="preparation">Prepare-se</string>
+    <string name="shooting">Atirar</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Tempo de tiro</string>
+    <string name="timer_waiting_time">Tempo de preparo</string>
+    <string name="timer_warning_time">Tempo de aviso</string>
+    <string name="timer_sound">Som</string>
+    <string name="timer_vibrate">Vibrar</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Importar</string>
+    <string name="exports_as_csv">Exporta como .csv</string>
+    <string name="licences">Licenças de código aberto</string>
+    <string name="licences_summary">Notas legais de Licenças</string>
+    <string name="version">Versão %s</string>
+    <plurals name="second">
+        <item quantity="one">%d segundos</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <string name="info">Informação</string>
+    <string name="data">Dados</string>
+    <string name="weather">Clima</string>
+    <string name="environment">Ambiente</string>
+    <string name="wind_speed">Velocidade do vento</string>
+    <string name="wind_direction">Direção do vento</string>
+    <string name="sight_setting_removed">Configuração de mira excluída!</string>
+    <string name="metric">Métrico</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Desfazer</string>
+    <string name="standard_rounds">Partida padrão</string>
+    <string name="expand_collapse">Expandir/recolher</string>
+    <string name="new_round_template">Novo modelo</string>
+    <string name="arrow_numbers">Números de Flecha</string>
+    <string name="round_removed">Round removido!</string>
+    <string name="custom_round">Partida personalizada</string>
+    <string name="filter">Filtro</string>
+    <string name="club">Infantil</string>
+    <string name="target">Alvo</string>
+    <string name="standard_round">Partida padrão</string>
+    <string name="use_as_template">Usar como modelo?</string>
+    <string name="create_copy">Esse é um round padrão!\n Deseja criar uma cópia para editar?</string>
+    <string name="practice">Treinar</string>
+    <string name="edit_training">Editar o treino</string>
+    <string name="edit_standard_round">Editar Partida Padrão</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d flecha eliminada</item>
+        <item quantity="other">%d flechas apagadas</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d arco apagado</item>
+        <item quantity="other">%d arco apagado</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d treino apagado</item>
+        <item quantity="other">%d treinos apagados</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d série apagada</item>
+        <item quantity="other">%d entradas apagadas</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Partida %d</item>
+        <item quantity="other">Partida %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d rounds selecionado</item>
+        <item quantity="other">%d rounds selecionados</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round excluído</item>
+        <item quantity="other">%d rounds excluídos</item>
+    </plurals>
+    <string name="date">Data</string>
+    <string name="edit_round">Editar round</string>
+    <string name="draw_weight">Potência na puxada</string>
+    <string name="sight">Mira</string>
+    <string name="limbs">Lâminas</string>
+    <string name="my_bow">Meu arco</string>
+    <string name="my_arrow">Minhas flechas</string>
+    <string name="tip_weight">Peso das pontas</string>
+    <string name="arrow_ranking">Classificação da flecha</string>
+    <string name="arrow_x_of_set_of_arrows">Flecha %1$s de %2$s</string>
+    <string name="display">Mostrar</string>
+    <string name="print">Imprimir</string>
+    <string name="table">Tabela</string>
+    <string name="comments">Comentários</string>
+    <string name="show_points_colored">Mostrar pontos coloridos</string>
+    <string name="stabilizer">Estabilizador</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Flecha número %s</string>
+    <string name="training_with_standard_round">Treinamento com Standard Round</string>
+    <string name="free_training">Treino Livre</string>
+    <string name="competition">Competição</string>
+    <string name="about">Sobre</string>
+    <string name="general">Geral</string>
+    <string name="contribute">Contribua</string>
+    <string name="connect">Conectar</string>
+    <string name="special_thanks_to">Agradecimentos especiais para</string>
+    <string name="all_translators">Todos os caras, que ajudaram a traduzir o app!</string>
+    <string name="all_beta_testers">Todos os que se juntaram ao grupo de testadores beta e, portanto, ajudaram a melhorar continuamente o app.</string>
+    <string name="test_beta">Testar a versão beta mais recente</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Compartilhe com seus amigos</string>
+    <string name="donate">Faça uma doação</string>
+    <string name="donate_via_paypal">Doar via PayPal</string>
+    <string name="translate_crowdin">Traduza no Crowdin</string>
+    <string name="network_linkedin">Rede no LinkedIn</string>
+    <string name="search">Busca</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Treino Completo</string>
+    <string name="show_shots_round">Round atual</string>
+    <string name="show_shots_end">Série atual</string>
+    <string name="profile">Perfil</string>
+    <string name="birthday">Data de nascimento</string>
+    <string name="first_name">Nome</string>
+    <string name="last_name">Sobrenome</string>
+    <string name="age">Idade</string>
+    <string name="show_signature">Assinatura</string>
+    <string name="archer">Arqueiro</string>
+    <string name="hits">Acertos</string>
+    <string name="misses">Erros</string>
+    <string name="new_end">Nova série</string>
+    <string name="distribution">Distribuição</string>
+    <string name="count">Contagem</string>
+    <string name="diameter">Diâmetro</string>
+    <string name="input">Entrada</string>
+    <string name="target_zoom">Nível de zoom do alvo</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Escala do diâmetro da flecha</string>
+    <string name="timestamp">Horário</string>
+    <string name="change_target_face">Mudar face do alvo</string>
+    <string name="your_first_training">Seu primeiro treino</string>
+    <string name="grouping">Agrupamento</string>
+    <string name="show_clusters">Grupos</string>
+    <string name="first_training_description">Toque no \"+\" para iniciar novo treinamento.</string>
+    <string name="show_average">Média</string>
+    <string name="show_none">Nenhum</string>
+    <string name="left_handed">Canhoto</string>
+    <string name="right_handed">Destro</string>
+    <string name="keyboard">Teclado</string>
+    <string name="backup_drive_desc">O backup permite recuperar todos os dados de treinamentos em caso de perda ou troca de telefone.</string>
+    <string name="backup_now">Fazer backup agora</string>
+    <string name="last_backup">Último backup: %s</string>
+    <string name="recent_backups">Backups recentes</string>
+    <string name="dialog_restore_title">Retornar à versão anterior</string>
+    <string name="restore_desc">O restauro do backup irá sobrescrever todos os dados existentes.</string>
+    <string name="backup_details">Detalhes do backup</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_location">Local do backup</string>
+    <string name="internal_storage">Armazenamento interno</string>
+    <string name="automatic_backup">Backup automático</string>
+    <string name="restoring">Restaurando o backup…</string>
+    <string name="restore_failed">Falha na restauração</string>
+    <string name="delete_failed">Falha ao excluir</string>
+    <string name="backup_restore_desc">Backup e restauro de dados do aplicativo</string>
+    <string name="exporting">Exportando…</string>
+    <string name="loading_backups_failed">Falha no carregamento dos backups!</string>
+    <string name="external_storage">Armazenamento externo</string>
+    <string name="backup_interval">Intervalo de backup</string>
+    <string name="daily">Diariamente</string>
+    <string name="weekly">Semanalmente</string>
+    <string name="monthly">Mensalmente</string>
+    <string name="connection_failed">Falha na conexão!</string>
+    <string name="shooting_indoor">Tiro indoor</string>
+    <string name="bow_rest_vertical_position">Posição vertical</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Posição horizontal</string>
+    <string name="bow_cam_settings">Configurações das roldanas</string>
+    <string name="bow_letoff_weight">Peso de let-off</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">Corda</string>
+    <string name="bow_scope_magnification">Amplificação da mira</string>
+    <string name="bow_rest_stiffness">Rigidez</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">Mais campos</string>
+    <string name="recently_used">Usado recentemente</string>
+    <string name="intro_title_track_training_progress">Esquecer planilhas de papel!</string>
+    <string name="intro_description_track_training_progress">Com a exibição precisa das flechas,\nvocê pode obter boas ideias\na partir dos dados de treinamento.</string>
+    <string name="intro_title_everything_in_one_place">Tudo o que você precisa\nem um único lugar</string>
+    <string name="intro_description_everything_in_one_place">Incluindo gerenciamento de arcos, flechas\ne miras, além de\ncronômetro, estatísticas \ne muito mais…</string>
+    <string name="average_arrow_score_per_end">Pontuação média de flecha por série</string>
+    <string name="show_end">Mostrar série</string>
+    <string name="show_round">Mostrar round</string>
+    <string name="show_training">Mostrar treinamento</string>
+    <string name="summary">Resumo</string>
+    <string name="end">Série</string>
+    <string name="average_of">Média de</string>
+    <string name="displayed_shots">Tiros a exibir</string>
+    <string name="invalid_decimal_number">Número decimal inválido</string>
+    <string name="not_within_expected_range_mm">Fora do intervalo válido de 1 a 20mm</string>
+    <string name="not_within_expected_range_inch">Fora do intervalo válido de 0 a 1 polegada</string>
+    <string name="next_round">Próximo round</string>
+    <string name="previous_round">Round anterior</string>
+    <string name="overview">Visão geral</string>
+    <string name="score">Pontuação</string>
+    <string name="show_reached_score">Mostrar pontuação alcançada</string>
+    <string name="show_total_score">Mostrar pontuação total</string>
+    <string name="show_percentage">Mostrar porcentagens</string>
+    <string name="show_arrow_average">Mostrar média da flecha</string>
+    <string name="image_deleted">Imagem excluída</string>
+    <string name="delete_image">Excluir imagem?</string>
+    <string name="keyboard_type">Tipo de teclado</string>
+    <string name="keyboard_enabled">Teclado habilitado</string>
+    <string name="sort_shots">Classificar tiros</string>
+    <string name="sort_shots_for_spots">Classificar tiros por faces de alvo</string>
+    <string name="target_captain">Capitão de alvos</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Série %1$d/%2$d</string>
+    <string name="round_x_of_y">Partida %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5e863487a..cacb14bc1 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opções</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Anterior</string>
-  <string name="next">Próximo</string>
-  <string name="save">Salvar</string>
-  <string name="custom">Personalizar</string>
-  <string name="training">Treino</string>
-  <string name="bow">Arco</string>
-  <string name="arrow">Flecha</string>
-  <string name="round">Round</string>
-  <string name="points">Pontos</string>
-  <string name="passe">Série</string>
-  <!-- Overview -->
-  <string name="new_training">Novo treino</string>
-  <string name="new_bow">Novo arco</string>
-  <string name="new_arrow">Nova flecha</string>
-  <string name="new_round">Novo round</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d treino selecionado</item>
-    <item quantity="other">%d treinos selecionados</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d arco selecionado</item>
-    <item quantity="other">%d arcos selecionados</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d flecha selecionada</item>
-    <item quantity="other">%d flechas selecionadas</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d série selecionada</item>
-    <item quantity="other">%d séries selecionadas</item>
-  </plurals>
-  <string name="edit">Editar</string>
-  <string name="delete">Apagar</string>
-  <string name="statistic">Estatística</string>
-  <!-- Share -->
-  <string name="share">Compartilhar</string>
-  <string name="dispersion_pattern">Padrão de dispersão</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Enviar dados exportados</string>
-  <string name="exporting_failed">Exportação falhou!</string>
-  <!-- New bow -->
-  <string name="add_bow">Adicionar arco</string>
-  <string name="name">Nome</string>
-  <string name="bow_type">Tipo de arco</string>
-  <string name="properties">Propriedades</string>
-  <string name="brand">Marca</string>
-  <string name="size">Tamanho</string>
-  <string name="description">Descrição</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Configurações de aparência</string>
-  <string name="add">Adicionar</string>
-  <string name="take_picture">Tirar uma foto</string>
-  <string name="pick_from_gallery">Selecionar uma foto da galeria</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Adicionar flecha</string>
-  <string name="length">Comprimento</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Peso</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Título</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distância</string>
-  <string name="format">Formato</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d série</item>
-    <item quantity="other">%d séries</item>
-  </plurals>
-  <string name="with">de</string>
-  <plurals name="arrow">
-    <item quantity="one">%d flecha</item>
-    <item quantity="other">%d flechas</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Flechas</string>
-  <string name="sum">Soma</string>
-  <string name="carry">Acumulado</string>
-  <string name="action_print">Imprimir</string>
-  <string name="average">Média</string>
-  <!-- Input mode -->
-  <string name="comment">Comentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Selecione um arquivo</string>
-  <string name="dir_not_created">Diretório não pôde ser criado!</string>
-  <string name="import_failed">Importação falhou!</string>
-  <string name="file_not_found">Arquivo não encontrado!</string>
-  <string name="failed_reading_file">Falha na leitura do arquivo!</string>
-  <!-- Donate -->
-  <string name="donate_2">Doe-me um hamburger</string>
-  <string name="donate_5">Doe-me um kebab</string>
-  <string name="donate_10">Doe-me uma pizza grande</string>
-  <string name="donate_20">Doe-me combustível</string>
-  <string name="donation_thank">Obrigado por seu apoio!</string>
-  <string name="donate_text" formatted="false">Os valores incluem VAT e 30% de fees para o Google. Como alternativa, você pode doar livremente na conta PayPal dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Cronômetro</string>
-  <string name="touch_to_start">Toque para começar</string>
-  <string name="preparation">Preparação</string>
-  <string name="shooting">Atirar</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Tempo de tiro</string>
-  <string name="timer_waiting_time">Tempo de preparo</string>
-  <string name="timer_warning_time">tempo de advertência</string>
-  <string name="timer_sound">Som</string>
-  <string name="timer_vibrate">Vibrar</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Importar</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Abrir códigos de licenças</string>
-  <string name="licences_summary">Notas legais de Licenças</string>
-  <string name="version">Versão %s</string>
-  <plurals name="second">
-    <item quantity="one">%d segundo</item>
-    <item quantity="other">%d segundos</item>
-  </plurals>
-  <string name="info">Informação</string>
-  <string name="data">Dados</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Desfazer</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Série %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opções</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Anterior</string>
+    <string name="next">Próximo</string>
+    <string name="save">Salvar</string>
+    <string name="custom">Personalizar</string>
+    <string name="training">Treino</string>
+    <string name="bow">Arco</string>
+    <string name="arrow">Flecha</string>
+    <string name="round">Round</string>
+    <string name="points">Pontos</string>
+    <string name="passe">Série</string>
+    <!-- Overview -->
+    <string name="new_training">Novo treino</string>
+    <string name="new_bow">Novo arco</string>
+    <string name="new_arrow">Nova flecha</string>
+    <string name="new_round">Novo round</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d treino selecionado</item>
+        <item quantity="other">%d treinos selecionados</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d arco selecionado</item>
+        <item quantity="other">%d arcos selecionados</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d flecha selecionada</item>
+        <item quantity="other">%d flechas selecionadas</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d série selecionada</item>
+        <item quantity="other">%d séries selecionadas</item>
+    </plurals>
+    <string name="edit">Editar</string>
+    <string name="delete">Apagar</string>
+    <string name="statistic">Estatística</string>
+    <!-- Share -->
+    <string name="share">Compartilhar</string>
+    <string name="dispersion_pattern">Padrão de dispersão</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Enviar dados exportados</string>
+    <string name="exporting_failed">Exportação falhou!</string>
+    <!-- New bow -->
+    <string name="add_bow">Adicionar arco</string>
+    <string name="name">Nome</string>
+    <string name="bow_type">Tipo de arco</string>
+    <string name="properties">Propriedades</string>
+    <string name="brand">Marca</string>
+    <string name="size">Tamanho</string>
+    <string name="description">Descrição</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Configurações de aparência</string>
+    <string name="add">Adicionar</string>
+    <string name="take_picture">Tirar uma foto</string>
+    <string name="pick_from_gallery">Selecionar uma foto da galeria</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Adicionar flecha</string>
+    <string name="length">Comprimento</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Peso</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Título</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distância</string>
+    <string name="format">Formato</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d série</item>
+        <item quantity="other">%d séries</item>
+    </plurals>
+    <string name="with">de</string>
+    <plurals name="arrow">
+        <item quantity="one">%d flecha</item>
+        <item quantity="other">%d flechas</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Flechas</string>
+    <string name="sum">Soma</string>
+    <string name="carry">Acumulado</string>
+    <string name="action_print">Imprimir</string>
+    <string name="average">Média</string>
+    <!-- Input mode -->
+    <string name="comment">Comentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Selecione um arquivo</string>
+    <string name="dir_not_created">Diretório não pôde ser criado!</string>
+    <string name="import_failed">Importação falhou!</string>
+    <string name="file_not_found">Arquivo não encontrado!</string>
+    <string name="failed_reading_file">Falha na leitura do arquivo!</string>
+    <!-- Donate -->
+    <string name="donate_2">Doe-me um hamburger</string>
+    <string name="donate_5">Doe-me um kebab</string>
+    <string name="donate_10">Doe-me uma pizza grande</string>
+    <string name="donate_20">Doe-me combustível</string>
+    <string name="donation_thank">Obrigado por seu apoio!</string>
+    <string name="donate_text" formatted="false">Os valores incluem VAT e 30% de fees para o Google. Como alternativa, você pode doar livremente na conta PayPal dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Cronômetro</string>
+    <string name="touch_to_start">Toque para começar</string>
+    <string name="preparation">Preparação</string>
+    <string name="shooting">Atirar</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Tempo de tiro</string>
+    <string name="timer_waiting_time">Tempo de preparo</string>
+    <string name="timer_warning_time">tempo de advertência</string>
+    <string name="timer_sound">Som</string>
+    <string name="timer_vibrate">Vibrar</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Importar</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Abrir códigos de licenças</string>
+    <string name="licences_summary">Notas legais de Licenças</string>
+    <string name="version">Versão %s</string>
+    <plurals name="second">
+        <item quantity="one">%d segundo</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <string name="info">Informação</string>
+    <string name="data">Dados</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Desfazer</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Série %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index cd8891dd4..68856a442 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -15,369 +15,370 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Opțiuni</string>
-  <string name="settings">Setări</string>
-  <string name="prev">Anterior</string>
-  <string name="next">Următor</string>
-  <string name="save">Salvare</string>
-  <string name="custom">Personalizare</string>
-  <string name="training">Antrenament</string>
-  <string name="bow">Arc</string>
-  <string name="arrow">Săgeată</string>
-  <string name="round">Runda</string>
-  <string name="points">Puncte</string>
-  <string name="passe">Set</string>
-  <!-- Overview -->
-  <string name="new_training">Antrenament nou</string>
-  <string name="new_bow">Arc nou</string>
-  <string name="new_arrow">Săgeată nouă</string>
-  <string name="new_round">Rundă nouă</string>
-  <plurals name="training_selected">
-    <item quantity="one">Antrenamentul %d selectat</item>
-    <item quantity="few">%d antrenamente selectate</item>
-    <item quantity="other">%d antrenamente selectate</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Arcul %d selectat</item>
-    <item quantity="few">%d arcuri selectate</item>
-    <item quantity="other">%d arcuri selectate</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Săgeata %d selectată</item>
-    <item quantity="few">%d săgeti selectate</item>
-    <item quantity="other">%d săgeti selectate</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Setul %d selectat</item>
-    <item quantity="few">%d seturi selectate</item>
-    <item quantity="other">%d seturi selectate</item>
-  </plurals>
-  <string name="edit">Editare</string>
-  <string name="delete">Șterge</string>
-  <string name="statistic">Statistică</string>
-  <!-- Share -->
-  <string name="share">Distribuie</string>
-  <string name="dispersion_pattern">Modelul de dispersie</string>
-  <string name="sharing_failed">Distribuirea nu a reușit!</string>
-  <!-- Export -->
-  <string name="send_exported">Trimite datele exportate</string>
-  <string name="exporting_failed">Exportul a eșuat!</string>
-  <!-- New bow -->
-  <string name="add_bow">Adauga arc</string>
-  <string name="name">Nume</string>
-  <string name="bow_type">Tipul de arc</string>
-  <string name="properties">Proprietăţi</string>
-  <string name="brand">Marcă</string>
-  <string name="size">Dimensiune</string>
-  <string name="description">Descriere</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Setări aparat de ochire</string>
-  <string name="add">Adaugă</string>
-  <string name="take_picture">Fotografiați</string>
-  <string name="pick_from_gallery">Selectaţi imagine din Galerie</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Adauga săgeată</string>
-  <string name="length">Lungime</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Greutate</string>
-  <string name="vanes">Pene</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Titlu</string>
-  <string name="outdoor">Exterior</string>
-  <string name="indoor">Interior</string>
-  <string name="distance">Distanță</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d set</item>
-    <item quantity="few">%d seturi</item>
-    <item quantity="other">%d seturi</item>
-  </plurals>
-  <string name="with">din</string>
-  <plurals name="arrow">
-    <item quantity="one">%d săgeată</item>
-    <item quantity="few">%d săgeţi</item>
-    <item quantity="other">%d săgeţi</item>
-  </plurals>
-  <string name="target_face">Ţintă</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Fișă de scor</string>
-  <string name="arrows">Săgeți</string>
-  <string name="sum">Scor</string>
-  <string name="carry">Total</string>
-  <string name="action_print">Tipărește</string>
-  <string name="average">Media</string>
-  <!-- Input mode -->
-  <string name="comment">Comentariu</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Selectează un fișier</string>
-  <string name="dir_not_created">Directorul nu poate fi creat!</string>
-  <string name="import_failed">Import nereușit!</string>
-  <string name="file_not_found">Fișierul nu a fost găsit!</string>
-  <string name="failed_reading_file">Citirea fişierului nereuşită!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donează un burger</string>
-  <string name="donate_5">Donează un kebab</string>
-  <string name="donate_10">Donează o pizza</string>
-  <string name="donate_20">Donează carburant</string>
-  <string name="donation_thank">Vă mulțumim pentru susținere!</string>
-  <string name="donate_text" formatted="false">Sumele sunt incl. TVA şi 30 % taxe pentru Google. Alternativ pot dona cu placere pe PayPal cont dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Cronometru</string>
-  <string name="touch_to_start">Apasă pentru a începe</string>
-  <string name="preparation">Pregătește-te</string>
-  <string name="shooting">Tragere</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Timpul de tragere</string>
-  <string name="timer_waiting_time">Timp de pregătire</string>
-  <string name="timer_warning_time">Timp de avertizare</string>
-  <string name="timer_sound">Sunet</string>
-  <string name="timer_vibrate">Vibrație</string>
-  <!-- Settings -->
-  <string name="backup_action">Copie</string>
-  <string name="import_action">Importă</string>
-  <string name="exports_as_csv">Export ca Csv</string>
-  <string name="licences">Licențe Open Source</string>
-  <string name="licences_summary">Adnotările legale a licenţelor</string>
-  <string name="version">Versiunea %s</string>
-  <plurals name="second">
-    <item quantity="one">%d secundă</item>
-    <item quantity="few">%d secunde</item>
-    <item quantity="other">%d secunde</item>
-  </plurals>
-  <string name="info">Informaţii</string>
-  <string name="data">Data</string>
-  <string name="weather">Vremea</string>
-  <string name="environment">Mediu</string>
-  <string name="wind_speed">Viteza vântului</string>
-  <string name="wind_direction">Directia vantului</string>
-  <string name="sight_setting_removed">Setările aparatului de ochire au fost șterse!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Revenire</string>
-  <string name="standard_rounds">Runda standard</string>
-  <string name="expand_collapse">Extinde/Restrânge</string>
-  <string name="new_round_template">Şablon nou</string>
-  <string name="arrow_numbers">Numărul săgetilor</string>
-  <string name="round_removed">Rundă ştearsă!</string>
-  <string name="custom_round">Rundă personalizată</string>
-  <string name="filter">Filtrare</string>
-  <string name="club">Club</string>
-  <string name="target">Ţintă</string>
-  <string name="standard_round">Rundă standard</string>
-  <string name="use_as_template">Utilizează ca şablon?</string>
-  <string name="create_copy">Aceasta este o rotundă standard! \nDoriți să creați o copie pentru a o edita?</string>
-  <string name="practice">Antrenament</string>
-  <string name="edit_training">Editare antrenament</string>
-  <string name="edit_standard_round">Editare rundă standars</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">Săgeata %d ştearsă</item>
-    <item quantity="few">%d săgeţi şterse</item>
-    <item quantity="other">%d săgeţi şterse</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">Arcul %d şters</item>
-    <item quantity="few">%d arcuri şterse</item>
-    <item quantity="other">%d arcuri şterse</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">Antrenamentul %d şters</item>
-    <item quantity="few">%d antrenamente şterse</item>
-    <item quantity="other">%d antrenamente şterse</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">Runda %d ştearsă</item>
-    <item quantity="few">%d runde şterse</item>
-    <item quantity="other">%d runde şterse</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Runda %d</item>
-    <item quantity="few">%d runde</item>
-    <item quantity="other">%d runde</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">Runda %d selectată</item>
-    <item quantity="few">%d runde selectate</item>
-    <item quantity="other">%d runde selectate</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">Runda %d ştearsă</item>
-    <item quantity="few">%d runde ştearse</item>
-    <item quantity="other">%d runde ştearse</item>
-  </plurals>
-  <string name="date">Data</string>
-  <string name="edit_round">Editare runda</string>
-  <string name="draw_weight">Puterea de tragere</string>
-  <string name="sight">Sistem de ochire</string>
-  <string name="limbs">Brate</string>
-  <string name="my_bow">Arcul meu</string>
-  <string name="my_arrow">Săgetile mele</string>
-  <string name="tip_weight">Greutatea varfului</string>
-  <string name="arrow_ranking">Poziția săgeții</string>
-  <string name="arrow_x_of_set_of_arrows">Săgeata %1$s din %2$s</string>
-  <string name="display">Setări ecran</string>
-  <string name="print">Tipărire</string>
-  <string name="table">Tabel</string>
-  <string name="comments">Comentarii</string>
-  <string name="show_points_colored">Arată punctele colorate</string>
-  <string name="stabilizer">Stabilizator</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Săgeata numărul %s</string>
-  <string name="training_with_standard_round">Antrenament standard</string>
-  <string name="free_training">Antrenament Liber</string>
-  <string name="competition">Competiţie</string>
-  <string name="about">Despre</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribuie</string>
-  <string name="connect">Conectare</string>
-  <string name="special_thanks_to">Mulțumiri speciale</string>
-  <string name="all_translators">Tuturor celor care au ajutat la traducerea aplicației!</string>
-  <string name="all_beta_testers">Tuturor celor care s-au alăturat grupului de testeri beta şi, prin urmare, ajută pentru a îmbunătăţi in continuu aplicația.</string>
-  <string name="test_beta">Verificați cea mai recentă versiune beta</string>
-  <string name="join_on_google_plus">Alăturaţi-ne pe Google +</string>
-  <string name="share_with_friends">Distribuie prietenilor tăi</string>
-  <string name="donate">Donează</string>
-  <string name="donate_via_paypal">Doneaza prin PayPal</string>
-  <string name="translate_crowdin">Traduce pe Crowdin</string>
-  <string name="network_linkedin">Reţea pe LinkedIn</string>
-  <string name="search">Caută</string>
-  <string name="us">SUA</string>
-  <string name="show_shots_training">Întreagul antrenament</string>
-  <string name="show_shots_round">Runda curenta</string>
-  <string name="show_shots_end">Setul curent</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Data naşterii</string>
-  <string name="first_name">Prenume</string>
-  <string name="last_name">Nume</string>
-  <string name="age">Vârsta</string>
-  <string name="show_signature">Semnătura</string>
-  <string name="archer">Arcaș</string>
-  <string name="hits">Hit-uri</string>
-  <string name="misses">Ratate</string>
-  <string name="new_end">Set nou</string>
-  <string name="distribution">Distribuţie</string>
-  <string name="count">Contor</string>
-  <string name="diameter">Diametru</string>
-  <string name="input">Intrare</string>
-  <string name="target_zoom">Nivel de mărire a ţintei</string>
-  <string name="action_pdf">Exportă ca PDF</string>
-  <string name="arrow_diameter_scale">Diametru săgeată</string>
-  <string name="timestamp">Data/Ora</string>
-  <string name="change_target_face">Schimba ţinta</string>
-  <string name="your_first_training">Primul antrenament</string>
-  <string name="grouping">Grupare</string>
-  <string name="show_clusters">Grupuri</string>
-  <string name="first_training_description">Apasă \"+\" pentru a începe un nou antrenament.</string>
-  <string name="show_average">Medie</string>
-  <string name="show_none">Fără</string>
-  <string name="left_handed">Stângaci</string>
-  <string name="right_handed">Dreptaci</string>
-  <string name="keyboard">Tastatură</string>
-  <string name="backup_drive_desc">Copierea datelor pe Google Drive permite să restaurezi toate înregistrările în cazul în care pierzi telefonul.</string>
-  <string name="backup_now">Fă o copie acum</string>
-  <string name="last_backup">Ultimul backup: %s</string>
-  <string name="recent_backups">Backup-uri recente</string>
-  <string name="dialog_restore_title">Revenire la versiunea anterioară</string>
-  <string name="restore_desc">Restaurarea va suprascrie toate datele existente cu cele din backup.</string>
-  <string name="backup_details">Detalii backup</string>
-  <string name="restore">Restaurare</string>
-  <string name="backup_location">Locație backup</string>
-  <string name="internal_storage">Stocare internă</string>
-  <string name="automatic_backup">Backup automat</string>
-  <string name="restoring">Restaurare backup…</string>
-  <string name="restore_failed">Restabilire eșuată</string>
-  <string name="delete_failed">Ștergerea a eșuat</string>
-  <string name="backup_restore_desc">Backup şi restaurare</string>
-  <string name="exporting">Se exportă…</string>
-  <string name="loading_backups_failed">Încărcarea Backup-ului nu a reuşit!</string>
-  <string name="external_storage">Stocare externă</string>
-  <string name="backup_interval">Interval backup</string>
-  <string name="daily">Zilnic</string>
-  <string name="weekly">Săptămânal</string>
-  <string name="monthly">Lunar</string>
-  <string name="connection_failed">Conectare Eșuată!</string>
-  <string name="shooting_indoor">Tragere in interior</string>
-  <string name="bow_rest_vertical_position">Poziția verticală</string>
-  <string name="bow_rest">Suport sageata</string>
-  <string name="bow_rest_horizontal_position">Poziţie orizontală</string>
-  <string name="bow_cam_settings">Setări came</string>
-  <string name="bow_letoff_weight">Valoare Letoff</string>
-  <string name="bow_nocking_point">Punct de nock</string>
-  <string name="bow_string">Coarda</string>
-  <string name="bow_scope_magnification">Lupă</string>
-  <string name="bow_rest_stiffness">Rigiditate</string>
-  <string name="bow_button">Buton</string>
-  <string name="more_fields">Mai multe câmpuri</string>
-  <string name="recently_used">Utilizate Recent</string>
-  <string name="intro_title_track_training_progress">Uita de scorul pe hartie!</string>
-  <string name="intro_description_track_training_progress">Notarea sagetilor va ajuta sa va inbunatatiti antrenamentele.</string>
-  <string name="intro_title_everything_in_one_place">Tot ce ai nevoie intr-un singur loc</string>
-  <string name="intro_description_everything_in_one_place">Include date despre arc, sageti, valorile sistemului de ochire, cronometru, statistici si multe altele…</string>
-  <string name="average_arrow_score_per_end">Media valorilor sagetilor per set</string>
-  <string name="show_end">Arata setul</string>
-  <string name="show_round">Arata runda</string>
-  <string name="show_training">Arata antrenamentul</string>
-  <string name="summary">Rezumat</string>
-  <string name="end">Set</string>
-  <string name="average_of">Media a</string>
-  <string name="displayed_shots">Arata sagetile trase</string>
-  <string name="invalid_decimal_number">Număr zecimal invalid</string>
-  <string name="not_within_expected_range_mm">Nu este in intervalul de la 1 până la 20 mm</string>
-  <string name="not_within_expected_range_inch">Nu în intervalul de 0-1 inch</string>
-  <string name="next_round">Runda urmatoare</string>
-  <string name="previous_round">Runda precedentă</string>
-  <string name="overview">Rezumat</string>
-  <string name="score">Scor</string>
-  <string name="show_reached_score">Arată scorul</string>
-  <string name="show_total_score">Arată scorul total</string>
-  <string name="show_percentage">Afișează procentajul</string>
-  <string name="show_arrow_average">Arată media săgetilor</string>
-  <string name="image_deleted">Imagine stearsa</string>
-  <string name="delete_image">Ştergeţi imaginea?</string>
-  <string name="keyboard_type">Tip tastatură</string>
-  <string name="keyboard_enabled">Tastatură activată</string>
-  <string name="sort_shots">Trageri scurte</string>
-  <string name="sort_shots_for_spots">Trageri scurte pe tinte</string>
-  <string name="target_captain">Căpitanul ţintă</string>
-  <string name="language">Limbă</string>
-  <string name="warning_backup_experimental">Avertisment: Această optiune este încă experimentală! Vă rugăm să verificaţi la intervale regulate, în cazul în care copia a fost salvată cu succes!</string>
-  <string name="drawer_open">Deschide</string>
-  <string name="drawer_close">Închide</string>
-  <string name="help">Ajutor</string>
-  <string name="home">Start</string>
-  <string name="click_to_enter_profile">Clic pentru a introduce informaţii de profil</string>
-  <string name="no_trainings">Deocamdată, nu ai niciun abonament!</string>
-  <string name="no_bows">Nu sunt arcuri</string>
-  <string name="no_arrows">Nu sunt săgeţi</string>
-  <string name="version_info">Informații versiune</string>
-  <string name="version_prefix">Versiune</string>
-  <string name="max_arrow_number">Numărul maxim de săgeti</string>
-  <string name="distances">Distanțe</string>
-  <string name="diameters">Diametre</string>
-  <string name="bows">Arcuri</string>
-  <string name="reset">Resetare</string>
-  <string name="end_x_of_y">Seturi %1$d/%2$d</string>
-  <string name="round_x_of_y">Runde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Setaţi cronometru</string>
-  <string name="settings_summary_scoreboard">Schimba aspectul fisei de scor</string>
-  <string name="settings_summary_input">Personaliza ecranul</string>
-  <string name="settings_summary_overview">Personaliza informaţiile afişate pentru antrenamente, runde şi seturi</string>
-  <string name="settings_summary_profile">Informații personale</string>
-  <string name="licence_number">Licenta</string>
-  <string name="file_type">Tip fişier</string>
-  <string name="clear">Curăță</string>
-  <string name="tap_to_sign">Apăsați pentru a inscriere</string>
-  <string name="pdf_file">Fişier PDF</string>
-  <string name="image_file">Fișier imagine</string>
-  <string name="settings_summary_statistics">Ajustaţi ecranul statistici</string>
-  <string name="settings_statistics_spots_to_single_target">Pune sagetile pe o singura tinta</string>
-  <string name="keep_above_lockscreen">Deasupra ecranului de blocare</string>
-  <string name="scoreboard_title_all_rounds">Toate rundele</string>
-  <string name="permission_required">Permisiune necesară</string>
-  <string name="backup_permission_explanation"><![CDATA[Pentru a putea face o copie a datelor dumneavoastră, aplicatia are nevoie de permisiunea de a accesa stocarea interna a telefonului. Pentru a utiliza copia, du-te la setările de sistem > Apps > MyTargets > permisiuni şi permite \'Stocarea\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Opțiuni</string>
+    <string name="settings">Setări</string>
+    <string name="prev">Anterior</string>
+    <string name="next">Următor</string>
+    <string name="save">Salvare</string>
+    <string name="custom">Personalizare</string>
+    <string name="training">Antrenament</string>
+    <string name="bow">Arc</string>
+    <string name="arrow">Săgeată</string>
+    <string name="round">Runda</string>
+    <string name="points">Puncte</string>
+    <string name="passe">Set</string>
+    <!-- Overview -->
+    <string name="new_training">Antrenament nou</string>
+    <string name="new_bow">Arc nou</string>
+    <string name="new_arrow">Săgeată nouă</string>
+    <string name="new_round">Rundă nouă</string>
+    <plurals name="training_selected">
+        <item quantity="one">Antrenamentul %d selectat</item>
+        <item quantity="few">%d antrenamente selectate</item>
+        <item quantity="other">%d antrenamente selectate</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">Arcul %d selectat</item>
+        <item quantity="few">%d arcuri selectate</item>
+        <item quantity="other">%d arcuri selectate</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">Săgeata %d selectată</item>
+        <item quantity="few">%d săgeti selectate</item>
+        <item quantity="other">%d săgeti selectate</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">Setul %d selectat</item>
+        <item quantity="few">%d seturi selectate</item>
+        <item quantity="other">%d seturi selectate</item>
+    </plurals>
+    <string name="edit">Editare</string>
+    <string name="delete">Șterge</string>
+    <string name="statistic">Statistică</string>
+    <!-- Share -->
+    <string name="share">Distribuie</string>
+    <string name="dispersion_pattern">Modelul de dispersie</string>
+    <string name="sharing_failed">Distribuirea nu a reușit!</string>
+    <!-- Export -->
+    <string name="send_exported">Trimite datele exportate</string>
+    <string name="exporting_failed">Exportul a eșuat!</string>
+    <!-- New bow -->
+    <string name="add_bow">Adauga arc</string>
+    <string name="name">Nume</string>
+    <string name="bow_type">Tipul de arc</string>
+    <string name="properties">Proprietăţi</string>
+    <string name="brand">Marcă</string>
+    <string name="size">Dimensiune</string>
+    <string name="description">Descriere</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Setări aparat de ochire</string>
+    <string name="add">Adaugă</string>
+    <string name="take_picture">Fotografiați</string>
+    <string name="pick_from_gallery">Selectaţi imagine din Galerie</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Adauga săgeată</string>
+    <string name="length">Lungime</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Greutate</string>
+    <string name="vanes">Pene</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Titlu</string>
+    <string name="outdoor">Exterior</string>
+    <string name="indoor">Interior</string>
+    <string name="distance">Distanță</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d set</item>
+        <item quantity="few">%d seturi</item>
+        <item quantity="other">%d seturi</item>
+    </plurals>
+    <string name="with">din</string>
+    <plurals name="arrow">
+        <item quantity="one">%d săgeată</item>
+        <item quantity="few">%d săgeţi</item>
+        <item quantity="other">%d săgeţi</item>
+    </plurals>
+    <string name="target_face">Ţintă</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Fișă de scor</string>
+    <string name="arrows">Săgeți</string>
+    <string name="sum">Scor</string>
+    <string name="carry">Total</string>
+    <string name="action_print">Tipărește</string>
+    <string name="average">Media</string>
+    <!-- Input mode -->
+    <string name="comment">Comentariu</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Selectează un fișier</string>
+    <string name="dir_not_created">Directorul nu poate fi creat!</string>
+    <string name="import_failed">Import nereușit!</string>
+    <string name="file_not_found">Fișierul nu a fost găsit!</string>
+    <string name="failed_reading_file">Citirea fişierului nereuşită!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donează un burger</string>
+    <string name="donate_5">Donează un kebab</string>
+    <string name="donate_10">Donează o pizza</string>
+    <string name="donate_20">Donează carburant</string>
+    <string name="donation_thank">Vă mulțumim pentru susținere!</string>
+    <string name="donate_text" formatted="false">Sumele sunt incl. TVA şi 30 % taxe pentru Google. Alternativ pot dona cu placere pe PayPal cont dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Cronometru</string>
+    <string name="touch_to_start">Apasă pentru a începe</string>
+    <string name="preparation">Pregătește-te</string>
+    <string name="shooting">Tragere</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Timpul de tragere</string>
+    <string name="timer_waiting_time">Timp de pregătire</string>
+    <string name="timer_warning_time">Timp de avertizare</string>
+    <string name="timer_sound">Sunet</string>
+    <string name="timer_vibrate">Vibrație</string>
+    <!-- Settings -->
+    <string name="backup_action">Copie</string>
+    <string name="import_action">Importă</string>
+    <string name="exports_as_csv">Export ca Csv</string>
+    <string name="licences">Licențe Open Source</string>
+    <string name="licences_summary">Adnotările legale a licenţelor</string>
+    <string name="version">Versiunea %s</string>
+    <plurals name="second">
+        <item quantity="one">%d secundă</item>
+        <item quantity="few">%d secunde</item>
+        <item quantity="other">%d secunde</item>
+    </plurals>
+    <string name="info">Informaţii</string>
+    <string name="data">Data</string>
+    <string name="weather">Vremea</string>
+    <string name="environment">Mediu</string>
+    <string name="wind_speed">Viteza vântului</string>
+    <string name="wind_direction">Directia vantului</string>
+    <string name="sight_setting_removed">Setările aparatului de ochire au fost șterse!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Revenire</string>
+    <string name="standard_rounds">Runda standard</string>
+    <string name="expand_collapse">Extinde/Restrânge</string>
+    <string name="new_round_template">Şablon nou</string>
+    <string name="arrow_numbers">Numărul săgetilor</string>
+    <string name="round_removed">Rundă ştearsă!</string>
+    <string name="custom_round">Rundă personalizată</string>
+    <string name="filter">Filtrare</string>
+    <string name="club">Club</string>
+    <string name="target">Ţintă</string>
+    <string name="standard_round">Rundă standard</string>
+    <string name="use_as_template">Utilizează ca şablon?</string>
+    <string name="create_copy">Aceasta este o rotundă standard! \nDoriți să creați o copie pentru a o edita?</string>
+    <string name="practice">Antrenament</string>
+    <string name="edit_training">Editare antrenament</string>
+    <string name="edit_standard_round">Editare rundă standars</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">Săgeata %d ştearsă</item>
+        <item quantity="few">%d săgeţi şterse</item>
+        <item quantity="other">%d săgeţi şterse</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">Arcul %d şters</item>
+        <item quantity="few">%d arcuri şterse</item>
+        <item quantity="other">%d arcuri şterse</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">Antrenamentul %d şters</item>
+        <item quantity="few">%d antrenamente şterse</item>
+        <item quantity="other">%d antrenamente şterse</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">Runda %d ştearsă</item>
+        <item quantity="few">%d runde şterse</item>
+        <item quantity="other">%d runde şterse</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Runda %d</item>
+        <item quantity="few">%d runde</item>
+        <item quantity="other">%d runde</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">Runda %d selectată</item>
+        <item quantity="few">%d runde selectate</item>
+        <item quantity="other">%d runde selectate</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">Runda %d ştearsă</item>
+        <item quantity="few">%d runde ştearse</item>
+        <item quantity="other">%d runde ştearse</item>
+    </plurals>
+    <string name="date">Data</string>
+    <string name="edit_round">Editare runda</string>
+    <string name="draw_weight">Puterea de tragere</string>
+    <string name="sight">Sistem de ochire</string>
+    <string name="limbs">Brate</string>
+    <string name="my_bow">Arcul meu</string>
+    <string name="my_arrow">Săgetile mele</string>
+    <string name="tip_weight">Greutatea varfului</string>
+    <string name="arrow_ranking">Poziția săgeții</string>
+    <string name="arrow_x_of_set_of_arrows">Săgeata %1$s din %2$s</string>
+    <string name="display">Setări ecran</string>
+    <string name="print">Tipărire</string>
+    <string name="table">Tabel</string>
+    <string name="comments">Comentarii</string>
+    <string name="show_points_colored">Arată punctele colorate</string>
+    <string name="stabilizer">Stabilizator</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Săgeata numărul %s</string>
+    <string name="training_with_standard_round">Antrenament standard</string>
+    <string name="free_training">Antrenament Liber</string>
+    <string name="competition">Competiţie</string>
+    <string name="about">Despre</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribuie</string>
+    <string name="connect">Conectare</string>
+    <string name="special_thanks_to">Mulțumiri speciale</string>
+    <string name="all_translators">Tuturor celor care au ajutat la traducerea aplicației!</string>
+    <string name="all_beta_testers">Tuturor celor care s-au alăturat grupului de testeri beta şi, prin urmare, ajută pentru a îmbunătăţi in continuu aplicația.</string>
+    <string name="test_beta">Verificați cea mai recentă versiune beta</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Distribuie prietenilor tăi</string>
+    <string name="donate">Donează</string>
+    <string name="donate_via_paypal">Doneaza prin PayPal</string>
+    <string name="translate_crowdin">Traduce pe Crowdin</string>
+    <string name="network_linkedin">Reţea pe LinkedIn</string>
+    <string name="search">Caută</string>
+    <string name="us">SUA</string>
+    <string name="show_shots_training">Întreagul antrenament</string>
+    <string name="show_shots_round">Runda curenta</string>
+    <string name="show_shots_end">Setul curent</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Data naşterii</string>
+    <string name="first_name">Prenume</string>
+    <string name="last_name">Nume</string>
+    <string name="age">Vârsta</string>
+    <string name="show_signature">Semnătura</string>
+    <string name="archer">Arcaș</string>
+    <string name="hits">Hit-uri</string>
+    <string name="misses">Ratate</string>
+    <string name="new_end">Set nou</string>
+    <string name="distribution">Distribuţie</string>
+    <string name="count">Contor</string>
+    <string name="diameter">Diametru</string>
+    <string name="input">Intrare</string>
+    <string name="target_zoom">Nivel de mărire a ţintei</string>
+    <string name="action_pdf">Exportă ca PDF</string>
+    <string name="arrow_diameter_scale">Diametru săgeată</string>
+    <string name="timestamp">Data/Ora</string>
+    <string name="change_target_face">Schimba ţinta</string>
+    <string name="your_first_training">Primul antrenament</string>
+    <string name="grouping">Grupare</string>
+    <string name="show_clusters">Grupuri</string>
+    <string name="first_training_description">Apasă \"+\" pentru a începe un nou antrenament.</string>
+    <string name="show_average">Medie</string>
+    <string name="show_none">Fără</string>
+    <string name="left_handed">Stângaci</string>
+    <string name="right_handed">Dreptaci</string>
+    <string name="keyboard">Tastatură</string>
+    <string name="backup_drive_desc">Copierea datelor pe Google Drive permite să restaurezi toate înregistrările în cazul în care pierzi telefonul.</string>
+    <string name="backup_now">Fă o copie acum</string>
+    <string name="last_backup">Ultimul backup: %s</string>
+    <string name="recent_backups">Backup-uri recente</string>
+    <string name="dialog_restore_title">Revenire la versiunea anterioară</string>
+    <string name="restore_desc">Restaurarea va suprascrie toate datele existente cu cele din backup.</string>
+    <string name="backup_details">Detalii backup</string>
+    <string name="restore">Restaurare</string>
+    <string name="backup_location">Locație backup</string>
+    <string name="internal_storage">Stocare internă</string>
+    <string name="automatic_backup">Backup automat</string>
+    <string name="restoring">Restaurare backup…</string>
+    <string name="restore_failed">Restabilire eșuată</string>
+    <string name="delete_failed">Ștergerea a eșuat</string>
+    <string name="backup_restore_desc">Backup şi restaurare</string>
+    <string name="exporting">Se exportă…</string>
+    <string name="loading_backups_failed">Încărcarea Backup-ului nu a reuşit!</string>
+    <string name="external_storage">Stocare externă</string>
+    <string name="backup_interval">Interval backup</string>
+    <string name="daily">Zilnic</string>
+    <string name="weekly">Săptămânal</string>
+    <string name="monthly">Lunar</string>
+    <string name="connection_failed">Conectare Eșuată!</string>
+    <string name="shooting_indoor">Tragere in interior</string>
+    <string name="bow_rest_vertical_position">Poziția verticală</string>
+    <string name="bow_rest">Suport sageata</string>
+    <string name="bow_rest_horizontal_position">Poziţie orizontală</string>
+    <string name="bow_cam_settings">Setări came</string>
+    <string name="bow_letoff_weight">Valoare Letoff</string>
+    <string name="bow_nocking_point">Punct de nock</string>
+    <string name="bow_string">Coarda</string>
+    <string name="bow_scope_magnification">Lupă</string>
+    <string name="bow_rest_stiffness">Rigiditate</string>
+    <string name="bow_button">Buton</string>
+    <string name="more_fields">Mai multe câmpuri</string>
+    <string name="recently_used">Utilizate Recent</string>
+    <string name="intro_title_track_training_progress">Uita de scorul pe hartie!</string>
+    <string name="intro_description_track_training_progress">Notarea sagetilor va ajuta sa va inbunatatiti antrenamentele.</string>
+    <string name="intro_title_everything_in_one_place">Tot ce ai nevoie intr-un singur loc</string>
+    <string name="intro_description_everything_in_one_place">Include date despre arc, sageti, valorile sistemului de ochire, cronometru, statistici si multe altele…</string>
+    <string name="average_arrow_score_per_end">Media valorilor sagetilor per set</string>
+    <string name="show_end">Arata setul</string>
+    <string name="show_round">Arata runda</string>
+    <string name="show_training">Arata antrenamentul</string>
+    <string name="summary">Rezumat</string>
+    <string name="end">Set</string>
+    <string name="average_of">Media a</string>
+    <string name="displayed_shots">Arata sagetile trase</string>
+    <string name="invalid_decimal_number">Număr zecimal invalid</string>
+    <string name="not_within_expected_range_mm">Nu este in intervalul de la 1 până la 20 mm</string>
+    <string name="not_within_expected_range_inch">Nu în intervalul de 0-1 inch</string>
+    <string name="next_round">Runda urmatoare</string>
+    <string name="previous_round">Runda precedentă</string>
+    <string name="overview">Rezumat</string>
+    <string name="score">Scor</string>
+    <string name="show_reached_score">Arată scorul</string>
+    <string name="show_total_score">Arată scorul total</string>
+    <string name="show_percentage">Afișează procentajul</string>
+    <string name="show_arrow_average">Arată media săgetilor</string>
+    <string name="image_deleted">Imagine stearsa</string>
+    <string name="delete_image">Ştergeţi imaginea?</string>
+    <string name="keyboard_type">Tip tastatură</string>
+    <string name="keyboard_enabled">Tastatură activată</string>
+    <string name="sort_shots">Trageri scurte</string>
+    <string name="sort_shots_for_spots">Trageri scurte pe tinte</string>
+    <string name="target_captain">Căpitanul ţintă</string>
+    <string name="language">Limbă</string>
+    <string name="warning_backup_experimental">Avertisment: Această optiune este încă experimentală! Vă rugăm să verificaţi la intervale regulate, în cazul în care copia a fost salvată cu succes!</string>
+    <string name="drawer_open">Deschide</string>
+    <string name="drawer_close">Închide</string>
+    <string name="help">Ajutor</string>
+    <string name="home">Start</string>
+    <string name="click_to_enter_profile">Clic pentru a introduce informaţii de profil</string>
+    <string name="no_trainings">Deocamdată, nu ai niciun abonament!</string>
+    <string name="no_bows">Nu sunt arcuri</string>
+    <string name="no_arrows">Nu sunt săgeţi</string>
+    <string name="version_info">Informații versiune</string>
+    <string name="version_prefix">Versiune</string>
+    <string name="max_arrow_number">Numărul maxim de săgeti</string>
+    <string name="distances">Distanțe</string>
+    <string name="diameters">Diametre</string>
+    <string name="bows">Arcuri</string>
+    <string name="reset">Resetare</string>
+    <string name="end_x_of_y">Seturi %1$d/%2$d</string>
+    <string name="round_x_of_y">Runde %1$d/%2$d</string>
+    <string name="settings_summary_timer">Setaţi cronometru</string>
+    <string name="settings_summary_scoreboard">Schimba aspectul fisei de scor</string>
+    <string name="settings_summary_input">Personaliza ecranul</string>
+    <string name="settings_summary_overview">Personaliza informaţiile afişate pentru antrenamente, runde şi seturi</string>
+    <string name="settings_summary_profile">Informații personale</string>
+    <string name="licence_number">Licenta</string>
+    <string name="file_type">Tip fişier</string>
+    <string name="clear">Curăță</string>
+    <string name="tap_to_sign">Apăsați pentru a inscriere</string>
+    <string name="pdf_file">Fişier PDF</string>
+    <string name="image_file">Fișier imagine</string>
+    <string name="settings_summary_statistics">Ajustaţi ecranul statistici</string>
+    <string name="settings_statistics_spots_to_single_target">Pune sagetile pe o singura tinta</string>
+    <string name="keep_above_lockscreen">Deasupra ecranului de blocare</string>
+    <string name="scoreboard_title_all_rounds">Toate rundele</string>
+    <string name="permission_required">Permisiune necesară</string>
+    <string name="backup_permission_explanation"><![CDATA[Pentru a putea face o copie a datelor dumneavoastră, aplicatia are nevoie de permisiunea de a accesa stocarea interna a telefonului. Pentru a utiliza copia, du-te la setările de sistem > Apps > MyTargets > permisiuni şi permite \'Stocarea\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ed310f7b7..c2565db60 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Список опций</string>
-  <string name="settings">Настройки</string>
-  <string name="prev">Предыдущие</string>
-  <string name="next">Следующие</string>
-  <string name="save">Сохранить</string>
-  <string name="custom">Настройки</string>
-  <string name="training">Тренировка</string>
-  <string name="bow">Лук</string>
-  <string name="arrow">Стрела</string>
-  <string name="round">Раунд</string>
-  <string name="points">Очки</string>
-  <string name="passe">Серия</string>
-  <!-- Overview -->
-  <string name="new_training">Новая тренировка</string>
-  <string name="new_bow">Новый лук</string>
-  <string name="new_arrow">Новая стрела</string>
-  <string name="new_round">Новый раунд</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d тренировка выбрана</item>
-    <item quantity="few">%d тренировки выбраны</item>
-    <item quantity="many">%d тренировок выбраны</item>
-    <item quantity="other">%d тренировки выбраны</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d лук выбран</item>
-    <item quantity="few">%d лука выбраны</item>
-    <item quantity="many">%d луков выбраны</item>
-    <item quantity="other">%d лука выбраны</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d стрела выбрана</item>
-    <item quantity="few">%d стрелы выбраны</item>
-    <item quantity="many">%d стрел выбраны</item>
-    <item quantity="other">%d стрелы выбраны</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d серия выбрана</item>
-    <item quantity="few">%d серии выбраны</item>
-    <item quantity="many">%d серий выбраны</item>
-    <item quantity="other">%d серии выбраны</item>
-  </plurals>
-  <string name="edit">Редактировать</string>
-  <string name="delete">Удалить</string>
-  <string name="statistic">Статистика</string>
-  <!-- Share -->
-  <string name="share">Поделиться</string>
-  <string name="dispersion_pattern">Pазброс</string>
-  <string name="sharing_failed">Поделиться не удалось!</string>
-  <!-- Export -->
-  <string name="send_exported">Данные отправлены</string>
-  <string name="exporting_failed">Передача не удалась!</string>
-  <!-- New bow -->
-  <string name="add_bow">Добавить лук</string>
-  <string name="name">Название</string>
-  <string name="bow_type">Тип лука</string>
-  <string name="properties">Параметры</string>
-  <string name="brand">Производитель</string>
-  <string name="size">Длина рукоятки / общая длина лука</string>
-  <string name="description">Описание</string>
-  <string name="height">Режим нижнего плеча</string>
-  <string name="tiller">Режим верхнего плеча</string>
-  <string name="sight_settings">Настройки прицела</string>
-  <string name="add">Добавить</string>
-  <string name="take_picture">Сделать снимок</string>
-  <string name="pick_from_gallery">Выбрать изображение из галереи</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Добавить стрелу</string>
-  <string name="length">Длина</string>
-  <string name="spine">Спайн</string>
-  <string name="weight">Вес стрелы</string>
-  <string name="vanes">Перья</string>
-  <string name="nock">Хвостовик</string>
-  <string name="material">Материал</string>
-  <!-- New round -->
-  <string name="title">Название</string>
-  <string name="outdoor">На улице</string>
-  <string name="indoor">В помещении</string>
-  <string name="distance">Дистанция</string>
-  <string name="format">Формат</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d серия</item>
-    <item quantity="few">%d серии</item>
-    <item quantity="many">%d серий</item>
-    <item quantity="other">%d серии</item>
-  </plurals>
-  <string name="with">по</string>
-  <plurals name="arrow">
-    <item quantity="one">%d стрела</item>
-    <item quantity="few">%d стрелы</item>
-    <item quantity="many">%d стрел</item>
-    <item quantity="other">%d стрелы</item>
-  </plurals>
-  <string name="target_face">Вид мишени</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Результат</string>
-  <string name="arrows">Стрелы</string>
-  <string name="sum">Сумма</string>
-  <string name="carry">Итог</string>
-  <string name="action_print">Распечатать</string>
-  <string name="average">Среднее</string>
-  <!-- Input mode -->
-  <string name="comment">Комментарии</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Выберите файл</string>
-  <string name="dir_not_created">Директория не может быть создана!</string>
-  <string name="import_failed">Передача не удалась!</string>
-  <string name="file_not_found">Файл не найден!</string>
-  <string name="failed_reading_file">Не удалось прочитать файл!</string>
-  <!-- Donate -->
-  <string name="donate_2">Угостите меня бургером</string>
-  <string name="donate_5">Угостите меня кебабом</string>
-  <string name="donate_10">Угостите меня большой пиццей</string>
-  <string name="donate_20">Заправьте мою машину</string>
-  <string name="donation_thank">Спасибо за вашу поддержку!</string>
-  <string name="donate_text" formatted="false">Сумма включает НДС и 30% платежи для Google. Вместо этого можете воспользоваться PayPal. Мой аккаунт dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Таймер</string>
-  <string name="touch_to_start">Коснитесь экрана для старта</string>
-  <string name="preparation">Приготовились</string>
-  <string name="shooting">Стрельба</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Время стрельбы</string>
-  <string name="timer_waiting_time">Время подготовки</string>
-  <string name="timer_warning_time">\"Оранжевое\" время</string>
-  <string name="timer_sound">Со звуком</string>
-  <string name="timer_vibrate">Вибрация</string>
-  <!-- Settings -->
-  <string name="backup_action">Резервное копирование</string>
-  <string name="import_action">Импортировать резервную копию</string>
-  <string name="exports_as_csv">Экспортировать данные (CSV)</string>
-  <string name="licences">Открытая лицензия</string>
-  <string name="licences_summary">Правовая информация</string>
-  <string name="version">Версия %s</string>
-  <plurals name="second">
-    <item quantity="one">%d секунда</item>
-    <item quantity="few">%d секунд</item>
-    <item quantity="many">%d секунд</item>
-    <item quantity="other">%d секунды</item>
-  </plurals>
-  <string name="info">Информация</string>
-  <string name="data">Данные</string>
-  <string name="weather">Погода</string>
-  <string name="environment">Окружение</string>
-  <string name="wind_speed">Скорость ветра</string>
-  <string name="wind_direction">Направление ветра</string>
-  <string name="sight_setting_removed">Настройки прицела удалены!</string>
-  <string name="metric">Метрическая система</string>
-  <string name="imperial">Британская система мер</string>
-  <string name="undo">Отмена</string>
-  <string name="standard_rounds">Стандартные раунды</string>
-  <string name="expand_collapse">Развернуть/свернуть</string>
-  <string name="new_round_template">Новый шаблон</string>
-  <string name="arrow_numbers">Номера стрел</string>
-  <string name="round_removed">Один раунд удален!</string>
-  <string name="custom_round">Пользовательский раунд</string>
-  <string name="filter">Фильтр</string>
-  <string name="club">Клуб</string>
-  <string name="target">Мишень</string>
-  <string name="standard_round">Стандартный раунд</string>
-  <string name="use_as_template">Использовать шаблон?</string>
-  <string name="create_copy">Это стандартный раунд! Вы хотите создать копию, чтобы изменить его?</string>
-  <string name="practice">Тренировка</string>
-  <string name="edit_training">Изменить тренировку</string>
-  <string name="edit_standard_round">Изменить стандартный раунд</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d стрела удалена</item>
-    <item quantity="few">%d стрелы удалены</item>
-    <item quantity="many">%d стрел удалены</item>
-    <item quantity="other">%d стрелы удалены</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d лук удален</item>
-    <item quantity="few">%d лука удалены</item>
-    <item quantity="many">%d луков удалены</item>
-    <item quantity="other">%d лука удалены</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d тренировка удалена</item>
-    <item quantity="few">%d тренировки удалены</item>
-    <item quantity="many">%d тренировок удалены</item>
-    <item quantity="other">%d тренировки удалены</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d серия удалена</item>
-    <item quantity="few">%d серии удалены</item>
-    <item quantity="many">%d серий удалены</item>
-    <item quantity="other">%d серии удалены</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Раунд %d</item>
-    <item quantity="few">Раунд %d</item>
-    <item quantity="many">Раунд %d</item>
-    <item quantity="other">Раунд %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d раунд выбран</item>
-    <item quantity="few">%d раунда выбраны</item>
-    <item quantity="many">%d раундов выбраны</item>
-    <item quantity="other">%d раунда выбраны</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d раунд удален</item>
-    <item quantity="few">%d раунда удалены</item>
-    <item quantity="many">%d раундов удалены</item>
-    <item quantity="other">%d раунда удалены</item>
-  </plurals>
-  <string name="date">Дата</string>
-  <string name="edit_round">Редактировать раунд</string>
-  <string name="draw_weight">Сила натяжения</string>
-  <string name="sight">Прицел</string>
-  <string name="limbs">Плечи</string>
-  <string name="my_bow">Мой лук</string>
-  <string name="my_arrow">Моя стрела</string>
-  <string name="tip_weight">Вес наконечника</string>
-  <string name="arrow_ranking">Рейтинг стрел</string>
-  <string name="arrow_x_of_set_of_arrows">Стрела %1$s из %2$s</string>
-  <string name="display">Экран</string>
-  <string name="print">Распечатать</string>
-  <string name="table">Таблица</string>
-  <string name="comments">Комментарии</string>
-  <string name="show_points_colored">Показать окрашенные точки</string>
-  <string name="stabilizer">Стабилизатор</string>
-  <string name="clicker">Кликер</string>
-  <string name="arrow_number_x">Стрела номер %s</string>
-  <string name="training_with_standard_round">Тренировка со стандартным раундом</string>
-  <string name="free_training">Свободная тренировка</string>
-  <string name="competition">Соревнование</string>
-  <string name="about">Описание</string>
-  <string name="general">Основная информация</string>
-  <string name="contribute">Внести вклад</string>
-  <string name="connect">Соединение</string>
-  <string name="special_thanks_to">Особая благодарность</string>
-  <string name="all_translators">Всем парням, кто помогал перевести это приложение!</string>
-  <string name="all_beta_testers">Всем, кто присоединился к группам бета тестеров и, следовательно, позволяет постоянно совершенствовать приложение.</string>
-  <string name="test_beta">Протестировать последнюю бета-версию</string>
-  <string name="join_on_google_plus">Присоединяйтесь к нам в Google+</string>
-  <string name="share_with_friends">Поделиться с друзьями</string>
-  <string name="donate">Помощь проекту</string>
-  <string name="donate_via_paypal">Сделать пожертвование через PayPal</string>
-  <string name="translate_crowdin">Перевести с помощью Crowdin</string>
-  <string name="network_linkedin">Страница на LinkedIn</string>
-  <string name="search">Поиск</string>
-  <string name="us">США</string>
-  <string name="show_shots_training">Вся тренировка</string>
-  <string name="show_shots_round">Текущий раунд</string>
-  <string name="show_shots_end">Текущая серия</string>
-  <string name="profile">Профиль</string>
-  <string name="birthday">Дата рождения</string>
-  <string name="first_name">Имя</string>
-  <string name="last_name">Фамилия</string>
-  <string name="age">Возраст</string>
-  <string name="show_signature">Подпись</string>
-  <string name="archer">Стрелок</string>
-  <string name="hits">Попадания</string>
-  <string name="misses">Промахи</string>
-  <string name="new_end">Новая серия</string>
-  <string name="distribution">Распределение</string>
-  <string name="count">Итог</string>
-  <string name="diameter">Диаметр</string>
-  <string name="input">Ввод</string>
-  <string name="target_zoom">Уровень масштабирования цели</string>
-  <string name="action_pdf">Экспорт в PDF</string>
-  <string name="arrow_diameter_scale">Шкала диаметров стрел</string>
-  <string name="timestamp">Временная отметка</string>
-  <string name="change_target_face">Изменить вид мишени</string>
-  <string name="your_first_training">Ваша первая тренировка</string>
-  <string name="grouping">Группировка</string>
-  <string name="show_clusters">Кластеры</string>
-  <string name="first_training_description">Нажмите на значек \"плюс\" для начала новой тренировки.</string>
-  <string name="show_average">Среднее значение</string>
-  <string name="show_none">Нет значений</string>
-  <string name="left_handed">Режим левши</string>
-  <string name="right_handed">Режим правши</string>
-  <string name="keyboard">Клавиатура</string>
-  <string name="backup_drive_desc">Резервное сохранение ваших данных позволит вам восстановить все результаты ваших тренировок в случае, если вы потеряете или смените телефон.</string>
-  <string name="backup_now">Создать резервную копию</string>
-  <string name="last_backup">Последнее резервное копирование: %s</string>
-  <string name="recent_backups">Недавние резервные копии</string>
-  <string name="dialog_restore_title">Вернуться к предыдущей версии</string>
-  <string name="restore_desc">Восстановление заменит существующие данные на данные из резервной копии.</string>
-  <string name="backup_details">Параметры резервного копирования</string>
-  <string name="restore">Восстановить</string>
-  <string name="backup_location">Расположение резервной копии</string>
-  <string name="internal_storage">Внутреннее хранилище</string>
-  <string name="automatic_backup">Автоматическое резервное копирование</string>
-  <string name="restoring">Восстановление из резервной копии…</string>
-  <string name="restore_failed">Не удалось восстановить</string>
-  <string name="delete_failed">Удаление не удалось</string>
-  <string name="backup_restore_desc">Резервное копирование и восстановление данных</string>
-  <string name="exporting">Экспортируется…</string>
-  <string name="loading_backups_failed">Загрузка резервной копии не удалась!</string>
-  <string name="external_storage">Внешний накопитель</string>
-  <string name="backup_interval">Интервал резервного копирования</string>
-  <string name="daily">Ежедневно</string>
-  <string name="weekly">Еженедельно</string>
-  <string name="monthly">Ежемесячно</string>
-  <string name="connection_failed">Соединение потеряно!</string>
-  <string name="shooting_indoor">Стрельба в помещении</string>
-  <string name="bow_rest_vertical_position">Положение по вертикали</string>
-  <string name="bow_rest">Полочка</string>
-  <string name="bow_rest_horizontal_position">Положение по горизонтали</string>
-  <string name="bow_cam_settings">Настройки блоков</string>
-  <string name="bow_letoff_weight">Снижение веса</string>
-  <string name="bow_nocking_point">Седло</string>
-  <string name="bow_string">Тетива</string>
-  <string name="bow_scope_magnification">Увеличение прицела</string>
-  <string name="bow_rest_stiffness">Жесткость</string>
-  <string name="bow_button">Плунжер</string>
-  <string name="more_fields">Дополнительные поля</string>
-  <string name="recently_used">Недавно использованные</string>
-  <string name="intro_title_track_training_progress">Забудьте бумажные бланки!</string>
-  <string name="intro_description_track_training_progress">Правильное указание положения стрелы в мишени даст более точный анализ результатов тренировки</string>
-  <string name="intro_title_everything_in_one_place">Все, что вам нужно в одном месте</string>
-  <string name="intro_description_everything_in_one_place">Включая лук, стрелы, настроцки прицела, стрелковый таймер, статистика и многое другое…</string>
-  <string name="average_arrow_score_per_end">Средний результат одного выстрела за серию</string>
-  <string name="show_end">Показать серию</string>
-  <string name="show_round">Показать раунд</string>
-  <string name="show_training">Вся тренировка</string>
-  <string name="summary">Результаты</string>
-  <string name="end">Серия</string>
-  <string name="average_of">Среднее от</string>
-  <string name="displayed_shots">Отображенные выстрелы</string>
-  <string name="invalid_decimal_number">Недопустимое число</string>
-  <string name="not_within_expected_range_mm">За пределами ожидаемого диапазона от 1 до 20 мм</string>
-  <string name="not_within_expected_range_inch">За пределами ожидаемого диапазона от 0 до 1 дюйма</string>
-  <string name="next_round">Следующий раунд</string>
-  <string name="previous_round">Предыдущий раунд</string>
-  <string name="overview">Обзор</string>
-  <string name="score">Результат</string>
-  <string name="show_reached_score">Показать достигнутый результат</string>
-  <string name="show_total_score">Показать общий результат</string>
-  <string name="show_percentage">Показать в процентах</string>
-  <string name="show_arrow_average">Показать среднее значение за выстрел</string>
-  <string name="image_deleted">Изображение удалено</string>
-  <string name="delete_image">Удалить изображение?</string>
-  <string name="keyboard_type">Режим ввода с клавиатуры</string>
-  <string name="keyboard_enabled">Клавиатура включена</string>
-  <string name="sort_shots">Сортировать выстрелы</string>
-  <string name="sort_shots_for_spots">Сортировать выстрелы по месту попадания в мишень</string>
-  <string name="target_captain">Капитан мишени</string>
-  <string name="language">Язык</string>
-  <string name="warning_backup_experimental">Предупреждение: Эта функция все еще является экспериментальной! Пожалуйста, проверьте было ли недавно выполнено резервное копирование данных!</string>
-  <string name="drawer_open">Открыть</string>
-  <string name="drawer_close">Закрыть</string>
-  <string name="help">Помощь</string>
-  <string name="home">Домашний экран</string>
-  <string name="click_to_enter_profile">Нажмите, чтобы ввести сведения о профиле</string>
-  <string name="no_trainings">У вас еще нет тренировок!</string>
-  <string name="no_bows">Нет луков</string>
-  <string name="no_arrows">Нет стрел</string>
-  <string name="version_info">Информация о версии</string>
-  <string name="version_prefix">Версия</string>
-  <string name="max_arrow_number">Максимальный номер стрелы</string>
-  <string name="distances">Дистанции</string>
-  <string name="diameters">Диаметры</string>
-  <string name="bows">Луки</string>
-  <string name="reset">Сброс</string>
-  <string name="end_x_of_y">Серия %1$d/%2$d</string>
-  <string name="round_x_of_y">Раунд %1$d/%2$d</string>
-  <string name="settings_summary_timer">Настройка стрелкового таймера</string>
-  <string name="settings_summary_scoreboard">Изменение внешнего вида таблицы результатов</string>
-  <string name="settings_summary_input">Настройка экрана ввода</string>
-  <string name="settings_summary_overview">Настроить информацию, отображаемую для тренировок, раундов и серий</string>
-  <string name="settings_summary_profile">Введите личные данные</string>
-  <string name="licence_number">Номер лицензии</string>
-  <string name="file_type">Тип файла</string>
-  <string name="clear">Очистить</string>
-  <string name="tap_to_sign">Коснитесь, чтобы подписать</string>
-  <string name="pdf_file">Файл в формате PDF</string>
-  <string name="image_file">Файл изображения</string>
-  <string name="settings_summary_statistics">Настроить экран статистики</string>
-  <string name="settings_statistics_spots_to_single_target">Соединить пятна к одной мишени</string>
-  <string name="keep_above_lockscreen">Оставить на экране блокировки</string>
-  <string name="scoreboard_title_all_rounds">Все раунды</string>
-  <string name="permission_required">Требуется разрешение</string>
-  <string name="backup_permission_explanation"><![CDATA[Для сохранения резервной копии данных приложению нужно разрешение на доступ к внутреннему хранилищу вашего устройства. Для использования возможностей резервного копирования перейдите > system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Список опций</string>
+    <string name="settings">Настройки</string>
+    <string name="prev">Предыдущие</string>
+    <string name="next">Следующие</string>
+    <string name="save">Сохранить</string>
+    <string name="custom">Настройки</string>
+    <string name="training">Тренировка</string>
+    <string name="bow">Лук</string>
+    <string name="arrow">Стрела</string>
+    <string name="round">Раунд</string>
+    <string name="points">Очки</string>
+    <string name="passe">Серия</string>
+    <!-- Overview -->
+    <string name="new_training">Новая тренировка</string>
+    <string name="new_bow">Новый лук</string>
+    <string name="new_arrow">Новая стрела</string>
+    <string name="new_round">Новый раунд</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d тренировка выбрана</item>
+        <item quantity="few">%d тренировки выбраны</item>
+        <item quantity="many">%d тренировок выбраны</item>
+        <item quantity="other">%d тренировки выбраны</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d лук выбран</item>
+        <item quantity="few">%d лука выбраны</item>
+        <item quantity="many">%d луков выбраны</item>
+        <item quantity="other">%d лука выбраны</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d стрела выбрана</item>
+        <item quantity="few">%d стрелы выбраны</item>
+        <item quantity="many">%d стрел выбраны</item>
+        <item quantity="other">%d стрелы выбраны</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d серия выбрана</item>
+        <item quantity="few">%d серии выбраны</item>
+        <item quantity="many">%d серий выбраны</item>
+        <item quantity="other">%d серии выбраны</item>
+    </plurals>
+    <string name="edit">Редактировать</string>
+    <string name="delete">Удалить</string>
+    <string name="statistic">Статистика</string>
+    <!-- Share -->
+    <string name="share">Поделиться</string>
+    <string name="dispersion_pattern">Pазброс</string>
+    <string name="sharing_failed">Поделиться не удалось!</string>
+    <!-- Export -->
+    <string name="send_exported">Данные отправлены</string>
+    <string name="exporting_failed">Передача не удалась!</string>
+    <!-- New bow -->
+    <string name="add_bow">Добавить лук</string>
+    <string name="name">Название</string>
+    <string name="bow_type">Тип лука</string>
+    <string name="properties">Параметры</string>
+    <string name="brand">Производитель</string>
+    <string name="size">Длина рукоятки / общая длина лука</string>
+    <string name="description">Описание</string>
+    <string name="height">Режим нижнего плеча</string>
+    <string name="tiller">Режим верхнего плеча</string>
+    <string name="sight_settings">Настройки прицела</string>
+    <string name="add">Добавить</string>
+    <string name="take_picture">Сделать снимок</string>
+    <string name="pick_from_gallery">Выбрать изображение из галереи</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Добавить стрелу</string>
+    <string name="length">Длина</string>
+    <string name="spine">Спайн</string>
+    <string name="weight">Вес стрелы</string>
+    <string name="vanes">Перья</string>
+    <string name="nock">Хвостовик</string>
+    <string name="material">Материал</string>
+    <!-- New round -->
+    <string name="title">Название</string>
+    <string name="outdoor">На улице</string>
+    <string name="indoor">В помещении</string>
+    <string name="distance">Дистанция</string>
+    <string name="format">Формат</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d серия</item>
+        <item quantity="few">%d серии</item>
+        <item quantity="many">%d серий</item>
+        <item quantity="other">%d серии</item>
+    </plurals>
+    <string name="with">из</string>
+    <plurals name="arrow">
+        <item quantity="one">%d стрела</item>
+        <item quantity="few">%d стрелы</item>
+        <item quantity="many">%d стрел</item>
+        <item quantity="other">%d стрелы</item>
+    </plurals>
+    <string name="target_face">Вид мишени</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Результат</string>
+    <string name="arrows">Стрелы</string>
+    <string name="sum">Сумма</string>
+    <string name="carry">Итог</string>
+    <string name="action_print">Распечатать</string>
+    <string name="average">Среднее</string>
+    <!-- Input mode -->
+    <string name="comment">Комментарии</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Выберите файл</string>
+    <string name="dir_not_created">Директория не может быть создана!</string>
+    <string name="import_failed">Передача не удалась!</string>
+    <string name="file_not_found">Файл не найден!</string>
+    <string name="failed_reading_file">Не удалось прочитать файл!</string>
+    <!-- Donate -->
+    <string name="donate_2">Угостите меня бургером</string>
+    <string name="donate_5">Угостите меня кебабом</string>
+    <string name="donate_10">Угостите меня большой пиццей</string>
+    <string name="donate_20">Заправьте мою машину</string>
+    <string name="donation_thank">Спасибо за вашу поддержку!</string>
+    <string name="donate_text" formatted="false">Сумма включает НДС и 30% платежи для Google. Вместо этого можете воспользоваться PayPal. Мой аккаунт dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Таймер</string>
+    <string name="touch_to_start">Коснитесь экрана для старта</string>
+    <string name="preparation">Приготовились</string>
+    <string name="shooting">Стрельба</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Время стрельбы</string>
+    <string name="timer_waiting_time">Время подготовки</string>
+    <string name="timer_warning_time">\"Оранжевое\" время</string>
+    <string name="timer_sound">Со звуком</string>
+    <string name="timer_vibrate">Вибрация</string>
+    <!-- Settings -->
+    <string name="backup_action">Резервное копирование</string>
+    <string name="import_action">Импортировать резервную копию</string>
+    <string name="exports_as_csv">Экспортировать данные (CSV)</string>
+    <string name="licences">Открытая лицензия</string>
+    <string name="licences_summary">Правовая информация</string>
+    <string name="version">Версия %s</string>
+    <plurals name="second">
+        <item quantity="one">%d секунда</item>
+        <item quantity="few">%d секунд</item>
+        <item quantity="many">%d секунд</item>
+        <item quantity="other">%d секунды</item>
+    </plurals>
+    <string name="info">Информация</string>
+    <string name="data">Данные</string>
+    <string name="weather">Погода</string>
+    <string name="environment">Окружение</string>
+    <string name="wind_speed">Скорость ветра</string>
+    <string name="wind_direction">Направление ветра</string>
+    <string name="sight_setting_removed">Настройки прицела удалены!</string>
+    <string name="metric">Метрическая система</string>
+    <string name="imperial">Британская система мер</string>
+    <string name="undo">Отмена</string>
+    <string name="standard_rounds">Стандартные раунды</string>
+    <string name="expand_collapse">Развернуть/свернуть</string>
+    <string name="new_round_template">Новый шаблон</string>
+    <string name="arrow_numbers">Номера стрел</string>
+    <string name="round_removed">Один раунд удален!</string>
+    <string name="custom_round">Пользовательский раунд</string>
+    <string name="filter">Фильтр</string>
+    <string name="club">Клуб</string>
+    <string name="target">Мишень</string>
+    <string name="standard_round">Стандартный раунд</string>
+    <string name="use_as_template">Использовать шаблон?</string>
+    <string name="create_copy">Это стандартный раунд! Вы хотите создать копию, чтобы изменить его?</string>
+    <string name="practice">Тренировка</string>
+    <string name="edit_training">Изменить тренировку</string>
+    <string name="edit_standard_round">Изменить стандартный раунд</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d стрела удалена</item>
+        <item quantity="few">%d стрелы удалены</item>
+        <item quantity="many">%d стрел удалены</item>
+        <item quantity="other">%d стрелы удалены</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d лук удален</item>
+        <item quantity="few">%d лука удалены</item>
+        <item quantity="many">%d луков удалены</item>
+        <item quantity="other">%d лука удалены</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d тренировка удалена</item>
+        <item quantity="few">%d тренировки удалены</item>
+        <item quantity="many">%d тренировок удалены</item>
+        <item quantity="other">%d тренировки удалены</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d серия удалена</item>
+        <item quantity="few">%d серии удалены</item>
+        <item quantity="many">%d серий удалены</item>
+        <item quantity="other">%d серии удалены</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Раунд %d</item>
+        <item quantity="few">Раунд %d</item>
+        <item quantity="many">Раунд %d</item>
+        <item quantity="other">Раунд %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d раунд выбран</item>
+        <item quantity="few">%d раунда выбраны</item>
+        <item quantity="many">%d раундов выбраны</item>
+        <item quantity="other">%d раунда выбраны</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d раунд удален</item>
+        <item quantity="few">%d раунда удалены</item>
+        <item quantity="many">%d раундов удалены</item>
+        <item quantity="other">%d раунда удалены</item>
+    </plurals>
+    <string name="date">Дата</string>
+    <string name="edit_round">Редактировать раунд</string>
+    <string name="draw_weight">Сила натяжения</string>
+    <string name="sight">Прицел</string>
+    <string name="limbs">Плечи</string>
+    <string name="my_bow">Мой лук</string>
+    <string name="my_arrow">Моя стрела</string>
+    <string name="tip_weight">Вес наконечника</string>
+    <string name="arrow_ranking">Рейтинг стрел</string>
+    <string name="arrow_x_of_set_of_arrows">Стрела %1$s из %2$s</string>
+    <string name="display">Экран</string>
+    <string name="print">Распечатать</string>
+    <string name="table">Таблица</string>
+    <string name="comments">Комментарии</string>
+    <string name="show_points_colored">Показать окрашенные точки</string>
+    <string name="stabilizer">Стабилизатор</string>
+    <string name="clicker">Кликер</string>
+    <string name="arrow_number_x">Стрела номер %s</string>
+    <string name="training_with_standard_round">Тренировка со стандартным раундом</string>
+    <string name="free_training">Свободная тренировка</string>
+    <string name="competition">Соревнование</string>
+    <string name="about">Описание</string>
+    <string name="general">Основная информация</string>
+    <string name="contribute">Внести вклад</string>
+    <string name="connect">Соединение</string>
+    <string name="special_thanks_to">Особая благодарность</string>
+    <string name="all_translators">Всем парням, кто помогал перевести это приложение!</string>
+    <string name="all_beta_testers">Всем, кто присоединился к группам бета тестеров и, следовательно, позволяет постоянно совершенствовать приложение.</string>
+    <string name="test_beta">Протестировать последнюю бета-версию</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Поделиться с друзьями</string>
+    <string name="donate">Помощь проекту</string>
+    <string name="donate_via_paypal">Сделать пожертвование через PayPal</string>
+    <string name="translate_crowdin">Перевести с помощью Crowdin</string>
+    <string name="network_linkedin">Страница на LinkedIn</string>
+    <string name="search">Поиск</string>
+    <string name="us">США</string>
+    <string name="show_shots_training">Вся тренировка</string>
+    <string name="show_shots_round">Текущий раунд</string>
+    <string name="show_shots_end">Текущая серия</string>
+    <string name="profile">Профиль</string>
+    <string name="birthday">Дата рождения</string>
+    <string name="first_name">Имя</string>
+    <string name="last_name">Фамилия</string>
+    <string name="age">Возраст</string>
+    <string name="show_signature">Подпись</string>
+    <string name="archer">Стрелок</string>
+    <string name="hits">Попадания</string>
+    <string name="misses">Промахи</string>
+    <string name="new_end">Новая серия</string>
+    <string name="distribution">Распределение</string>
+    <string name="count">Итог</string>
+    <string name="diameter">Диаметр</string>
+    <string name="input">Ввод</string>
+    <string name="target_zoom">Уровень масштабирования цели</string>
+    <string name="action_pdf">Экспорт в PDF</string>
+    <string name="arrow_diameter_scale">Шкала диаметров стрел</string>
+    <string name="timestamp">Временная отметка</string>
+    <string name="change_target_face">Изменить вид мишени</string>
+    <string name="your_first_training">Ваша первая тренировка</string>
+    <string name="grouping">Группировка</string>
+    <string name="show_clusters">Кластеры</string>
+    <string name="first_training_description">Нажмите на значек \"плюс\" для начала новой тренировки.</string>
+    <string name="show_average">Среднее значение</string>
+    <string name="show_none">Нет значений</string>
+    <string name="left_handed">Режим левши</string>
+    <string name="right_handed">Режим правши</string>
+    <string name="keyboard">Клавиатура</string>
+    <string name="backup_drive_desc">Резервное сохранение ваших данных позволит вам восстановить все результаты ваших тренировок в случае, если вы потеряете или смените телефон.</string>
+    <string name="backup_now">Создать резервную копию</string>
+    <string name="last_backup">Последнее резервное копирование: %s</string>
+    <string name="recent_backups">Недавние резервные копии</string>
+    <string name="dialog_restore_title">Вернуться к предыдущей версии</string>
+    <string name="restore_desc">Восстановление заменит существующие данные на данные из резервной копии.</string>
+    <string name="backup_details">Параметры резервного копирования</string>
+    <string name="restore">Восстановить</string>
+    <string name="backup_location">Расположение резервной копии</string>
+    <string name="internal_storage">Внутреннее хранилище</string>
+    <string name="automatic_backup">Автоматическое резервное копирование</string>
+    <string name="restoring">Восстановление из резервной копии…</string>
+    <string name="restore_failed">Не удалось восстановить</string>
+    <string name="delete_failed">Удаление не удалось</string>
+    <string name="backup_restore_desc">Резервное копирование и восстановление данных</string>
+    <string name="exporting">Экспортируется…</string>
+    <string name="loading_backups_failed">Загрузка резервной копии не удалась!</string>
+    <string name="external_storage">Внешний накопитель</string>
+    <string name="backup_interval">Интервал резервного копирования</string>
+    <string name="daily">Ежедневно</string>
+    <string name="weekly">Еженедельно</string>
+    <string name="monthly">Ежемесячно</string>
+    <string name="connection_failed">Соединение потеряно!</string>
+    <string name="shooting_indoor">Стрельба в помещении</string>
+    <string name="bow_rest_vertical_position">Положение по вертикали</string>
+    <string name="bow_rest">Полочка</string>
+    <string name="bow_rest_horizontal_position">Положение по горизонтали</string>
+    <string name="bow_cam_settings">Настройки блоков</string>
+    <string name="bow_letoff_weight">Снижение веса</string>
+    <string name="bow_nocking_point">Седло</string>
+    <string name="bow_string">Тетива</string>
+    <string name="bow_scope_magnification">Увеличение прицела</string>
+    <string name="bow_rest_stiffness">Жесткость</string>
+    <string name="bow_button">Плунжер</string>
+    <string name="more_fields">Дополнительные поля</string>
+    <string name="recently_used">Недавно использованные</string>
+    <string name="intro_title_track_training_progress">Забудьте бумажные бланки!</string>
+    <string name="intro_description_track_training_progress">Правильное указание положения стрелы в мишени даст более точный анализ результатов тренировки</string>
+    <string name="intro_title_everything_in_one_place">Все, что вам нужно в одном месте</string>
+    <string name="intro_description_everything_in_one_place">Включая лук, стрелы, настройки прицела, стрелковый таймер, статистика и многое другое…</string>
+    <string name="average_arrow_score_per_end">Средний результат одного выстрела за серию</string>
+    <string name="show_end">Показать серию</string>
+    <string name="show_round">Показать раунд</string>
+    <string name="show_training">Вся тренировка</string>
+    <string name="summary">Результаты</string>
+    <string name="end">Серия</string>
+    <string name="average_of">Среднее от</string>
+    <string name="displayed_shots">Отображённые выстрелы</string>
+    <string name="invalid_decimal_number">Недопустимое число</string>
+    <string name="not_within_expected_range_mm">За пределами ожидаемого диапазона от 1 до 20 мм</string>
+    <string name="not_within_expected_range_inch">За пределами ожидаемого диапазона от 0 до 1 дюйма</string>
+    <string name="next_round">Следующий раунд</string>
+    <string name="previous_round">Предыдущий раунд</string>
+    <string name="overview">Обзор</string>
+    <string name="score">Результат</string>
+    <string name="show_reached_score">Показать достигнутый результат</string>
+    <string name="show_total_score">Показать общий результат</string>
+    <string name="show_percentage">Показать в процентах</string>
+    <string name="show_arrow_average">Показать среднее значение за выстрел</string>
+    <string name="image_deleted">Изображение удалено</string>
+    <string name="delete_image">Удалить изображение?</string>
+    <string name="keyboard_type">Режим ввода с клавиатуры</string>
+    <string name="keyboard_enabled">Клавиатура включена</string>
+    <string name="sort_shots">Сортировать выстрелы</string>
+    <string name="sort_shots_for_spots">Сортировать выстрелы по месту попадания в мишень</string>
+    <string name="target_captain">Капитан мишени</string>
+    <string name="language">Язык</string>
+    <string name="warning_backup_experimental">Предупреждение: Эта функция все ещё является экспериментальной! Пожалуйста, проверьте было ли недавно выполнено резервное копирование данных!</string>
+    <string name="drawer_open">Открыть</string>
+    <string name="drawer_close">Закрыть</string>
+    <string name="help">Помощь</string>
+    <string name="home">Домашний экран</string>
+    <string name="click_to_enter_profile">Нажмите, чтобы ввести сведения о профиле</string>
+    <string name="no_trainings">У вас еще нет тренировок!</string>
+    <string name="no_bows">Нет луков</string>
+    <string name="no_arrows">Нет стрел</string>
+    <string name="version_info">Информация о версии</string>
+    <string name="version_prefix">Версия</string>
+    <string name="max_arrow_number">Максимальный номер стрелы</string>
+    <string name="distances">Дистанции</string>
+    <string name="diameters">Диаметры</string>
+    <string name="bows">Луки</string>
+    <string name="reset">Сброс</string>
+    <string name="end_x_of_y">Серия %1$d/%2$d</string>
+    <string name="round_x_of_y">Раунд %1$d/%2$d</string>
+    <string name="settings_summary_timer">Настройка стрелкового таймера</string>
+    <string name="settings_summary_scoreboard">Изменение внешнего вида таблицы результатов</string>
+    <string name="settings_summary_input">Настройка экрана ввода</string>
+    <string name="settings_summary_overview">Настроить информацию, отображаемую для тренировок, раундов и серий</string>
+    <string name="settings_summary_profile">Введите личные данные</string>
+    <string name="licence_number">Номер лицензии</string>
+    <string name="file_type">Тип файла</string>
+    <string name="clear">Очистить</string>
+    <string name="tap_to_sign">Коснитесь, чтобы подписать</string>
+    <string name="pdf_file">Файл в формате PDF</string>
+    <string name="image_file">Файл изображения</string>
+    <string name="settings_summary_statistics">Настроить экран статистики</string>
+    <string name="settings_statistics_spots_to_single_target">Соединить пятна к одной мишени</string>
+    <string name="keep_above_lockscreen">Оставить на экране блокировки</string>
+    <string name="scoreboard_title_all_rounds">Все раунды</string>
+    <string name="permission_required">Требуется разрешение</string>
+    <string name="backup_permission_explanation"><![CDATA[Для сохранения резервной копии данных приложению нужно разрешение на доступ к внутреннему хранилищу вашего устройства. Для использования возможностей резервного копирования перейдите > system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6cf3193e2..b4f70faf3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Možnosti</string>
-  <string name="settings">Nastavenia</string>
-  <string name="prev">Predchádzajúca</string>
-  <string name="next">Nasledujúca</string>
-  <string name="save">Uložiť</string>
-  <string name="custom">Voliteľné</string>
-  <string name="training">Tréning</string>
-  <string name="bow">Luk</string>
-  <string name="arrow">Šíp</string>
-  <string name="round">Kolo</string>
-  <string name="points">Body</string>
-  <string name="passe">Sada</string>
-  <!-- Overview -->
-  <string name="new_training">Nový tréning</string>
-  <string name="new_bow">Nový luk</string>
-  <string name="new_arrow">Nové šípy</string>
-  <string name="new_round">Nové kolo</string>
-  <plurals name="training_selected">
-    <item quantity="one">Vybraný tréning: %d</item>
-    <item quantity="few">Vybrané tréningy: %d</item>
-    <item quantity="many">%d trainings selected</item>
-    <item quantity="other">Vybraných tréningov: %d</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Vybraný luk: %d</item>
-    <item quantity="few">Vybrané luky: %d</item>
-    <item quantity="many">%d bows selected</item>
-    <item quantity="other">Vybraných lukov: %d</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Vybraný šíp: %d</item>
-    <item quantity="few">Vybrané šípy: %d</item>
-    <item quantity="many">%d arrows selected</item>
-    <item quantity="other">Vybraných šípov: %d</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d sada zvolená</item>
-    <item quantity="few">Vybrané sady: %d</item>
-    <item quantity="many">%d ends selected</item>
-    <item quantity="other">Vybraných sád: %d</item>
-  </plurals>
-  <string name="edit">Upraviť</string>
-  <string name="delete">Vymazať</string>
-  <string name="statistic">Štatistika</string>
-  <!-- Share -->
-  <string name="share">Zdieľať</string>
-  <string name="dispersion_pattern">Rozptyl</string>
-  <string name="sharing_failed">Zdieľanie zlyhalo!</string>
-  <!-- Export -->
-  <string name="send_exported">Poslať exportované údaje</string>
-  <string name="exporting_failed">Exportovanie zlyhalo!</string>
-  <!-- New bow -->
-  <string name="add_bow">Pridať luk</string>
-  <string name="name">Meno</string>
-  <string name="bow_type">Luk typu</string>
-  <string name="properties">Vlastnosti</string>
-  <string name="brand">Značka</string>
-  <string name="size">Veľkosť</string>
-  <string name="description">Popis</string>
-  <string name="height">Vzdialenosť tetivy</string>
-  <string name="tiller">Tiler</string>
-  <string name="sight_settings">Nastavenie zameriavača</string>
-  <string name="add">Pridať</string>
-  <string name="take_picture">Odfotiť</string>
-  <string name="pick_from_gallery">Vybrať obrázok z galérie</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Pridať šíp</string>
-  <string name="length">Dĺžka</string>
-  <string name="spine">Tvrdosť</string>
-  <string name="weight">Váha</string>
-  <string name="vanes">Krídielka</string>
-  <string name="nock">Končík</string>
-  <string name="material">Materiál</string>
-  <!-- New round -->
-  <string name="title">Názov</string>
-  <string name="outdoor">Vonku</string>
-  <string name="indoor">Hala</string>
-  <string name="distance">Vzdialenosť</string>
-  <string name="format">Formát</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d sada</item>
-    <item quantity="few">Sady: %d</item>
-    <item quantity="many">%d ends</item>
-    <item quantity="other">Sád: %d</item>
-  </plurals>
-  <string name="with">z</string>
-  <plurals name="arrow">
-    <item quantity="one">%d šíp</item>
-    <item quantity="few">%d šípy</item>
-    <item quantity="many">%d arrows</item>
-    <item quantity="other">%d šípov</item>
-  </plurals>
-  <string name="target_face">Typ terča</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Tabuľka výsledkov</string>
-  <string name="arrows">Šípy</string>
-  <string name="sum">Súčet</string>
-  <string name="carry">Kumulatív</string>
-  <string name="action_print">Tlačiť</string>
-  <string name="average">Priemer</string>
-  <!-- Input mode -->
-  <string name="comment">Komentár</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Vybrať súbor</string>
-  <string name="dir_not_created">Adresár nebolo možné vytvoriť!</string>
-  <string name="import_failed">Import bol neúspešný!</string>
-  <string name="file_not_found">Súbor sa nenašiel!</string>
-  <string name="failed_reading_file">Zlyhalo čítanie súboru!</string>
-  <!-- Donate -->
-  <string name="donate_2">Darujte mi hamburger</string>
-  <string name="donate_5">Darujte mi kebab</string>
-  <string name="donate_10">Darujte mi veľkú pizzu</string>
-  <string name="donate_20">Darujte mi nejaké palivo</string>
-  <string name="donation_thank">Vďaka za Vašu podporu!</string>
-  <string name="donate_text" formatted="false">Suma je vrátane DPH a 30% poplatkov pre Google. Prípadne ma môžete obdarovať cez PayPal účet dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Časovač</string>
-  <string name="touch_to_start">Stlačiť pre štart</string>
-  <string name="preparation">Pripravte sa</string>
-  <string name="shooting">Streľba</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Čas strieľania</string>
-  <string name="timer_waiting_time">Čas prípravy</string>
-  <string name="timer_warning_time">Čas upozornenia</string>
-  <string name="timer_sound">Zvuk</string>
-  <string name="timer_vibrate">Vibrovať</string>
-  <!-- Settings -->
-  <string name="backup_action">Záloha</string>
-  <string name="import_action">Importovať</string>
-  <string name="exports_as_csv">Vyexportovať ako csv</string>
-  <string name="licences">Open Source licencie</string>
-  <string name="licences_summary">Právne poznámky na licenciu</string>
-  <string name="version">Verzia %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekunda</item>
-    <item quantity="few">%d sekundy</item>
-    <item quantity="many">%d seconds</item>
-    <item quantity="other">%d sekúnd</item>
-  </plurals>
-  <string name="info">Informácie</string>
-  <string name="data">Dáta</string>
-  <string name="weather">Počasie</string>
-  <string name="environment">Prostredie</string>
-  <string name="wind_speed">Rýchlosť vetra</string>
-  <string name="wind_direction">Smer vetra</string>
-  <string name="sight_setting_removed">Nastavenie zameriavača vymazané!</string>
-  <string name="metric">Metrické</string>
-  <string name="imperial">Imperiálne</string>
-  <string name="undo">Späť</string>
-  <string name="standard_rounds">Štandardné kolá</string>
-  <string name="expand_collapse">Rozbaliť alebo zbaliť</string>
-  <string name="new_round_template">Nová šablóna</string>
-  <string name="arrow_numbers">Čísla šípov</string>
-  <string name="round_removed">Kolo vymazané!</string>
-  <string name="custom_round">Vlastné kolo</string>
-  <string name="filter">Filter</string>
-  <string name="club">Klub</string>
-  <string name="target">Terč</string>
-  <string name="standard_round">Štandardné kolo</string>
-  <string name="use_as_template">Použiť ako šablónu?</string>
-  <string name="create_copy">Jedná sa o štandardné kolo! \nChcete vytvoriť kópiu, aby ste ho mohli upraviť?</string>
-  <string name="practice">Tréning</string>
-  <string name="edit_training">Upraviť tréning</string>
-  <string name="edit_standard_round">Úprava štandardného kola</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d šíp odstránený</item>
-    <item quantity="few">%d šípy odstránené</item>
-    <item quantity="many">%d arrows deleted</item>
-    <item quantity="other">%d šípov odstránených</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d odstránený luk</item>
-    <item quantity="few">%d odstránené luky</item>
-    <item quantity="many">%d bows deleted</item>
-    <item quantity="other">%d odstránených lukov</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">Odstránený tréning: %d</item>
-    <item quantity="few">Odstránené tréningy: %d</item>
-    <item quantity="many">%d trainings deleted</item>
-    <item quantity="other">Odstránených tréningov: %d</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d sada odstránená</item>
-    <item quantity="few">Odstránené sady: %d</item>
-    <item quantity="many">%d ends deleted</item>
-    <item quantity="other">Odstránených sád: %d</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Kolo %d</item>
-    <item quantity="few">Kolo %d</item>
-    <item quantity="many">Round %d</item>
-    <item quantity="other">Kolá %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">Vybraté %d kolo</item>
-    <item quantity="few">Vybraté %d kolá</item>
-    <item quantity="many">%d rounds selected</item>
-    <item quantity="other">Vybratých %d kôl</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">Zmazané %d kolo</item>
-    <item quantity="few">Zmazané %d kolá</item>
-    <item quantity="many">%d rounds deleted</item>
-    <item quantity="other">Zmazaných %d kôl</item>
-  </plurals>
-  <string name="date">Dátum</string>
-  <string name="edit_round">Upraviť kolo</string>
-  <string name="draw_weight">Sila náťahu</string>
-  <string name="sight">Zameriavač</string>
-  <string name="limbs">Ramená</string>
-  <string name="my_bow">Môj luk</string>
-  <string name="my_arrow">Moje šípy</string>
-  <string name="tip_weight">Váha hrotu</string>
-  <string name="arrow_ranking">Hodnotenie šípu</string>
-  <string name="arrow_x_of_set_of_arrows">Šíp %1$s z %2$s</string>
-  <string name="display">Zobraziť</string>
-  <string name="print">Tlačiť</string>
-  <string name="table">Tabuľka</string>
-  <string name="comments">Komentáre</string>
-  <string name="show_points_colored">Zobraziť body farebne</string>
-  <string name="stabilizer">Stabilizátor</string>
-  <string name="clicker">Klapačka</string>
-  <string name="arrow_number_x">Š9po číslo %s</string>
-  <string name="training_with_standard_round">Tréning so štandardným kolom</string>
-  <string name="free_training">Voľný tréning</string>
-  <string name="competition">Súťaž</string>
-  <string name="about">O aplikácii</string>
-  <string name="general">Všeobecné</string>
-  <string name="contribute">Prispieť</string>
-  <string name="connect">Pripojiť</string>
-  <string name="special_thanks_to">Špeciálne poďakovanie</string>
-  <string name="all_translators">Všetci čo pomohli s prekladom aplikácie!</string>
-  <string name="all_beta_testers">Každý kto sa pridal do skupiny beta testovania a tým prispieva ku priebežnému zlepšovaniu aplikácie.</string>
-  <string name="test_beta">Otestovať najnovšiu beta verziu</string>
-  <string name="join_on_google_plus">Pridaj sa k nám na Google+</string>
-  <string name="share_with_friends">Zdieľať so svojimi kamarátmi</string>
-  <string name="donate">Prispieť</string>
-  <string name="donate_via_paypal">Prispieť cez PayPal</string>
-  <string name="translate_crowdin">Preložiť v Crowdin-e</string>
-  <string name="network_linkedin">Sieť v LinkedIn</string>
-  <string name="search">Hľadať</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Celý tréning</string>
-  <string name="show_shots_round">Aktuálne kolo</string>
-  <string name="show_shots_end">Aktuálna sada</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Narodeniny</string>
-  <string name="first_name">Meno</string>
-  <string name="last_name">Priezvisko</string>
-  <string name="age">Vek</string>
-  <string name="show_signature">Podpis</string>
-  <string name="archer">Lukostrelec</string>
-  <string name="hits">Zásahov</string>
-  <string name="misses">Minutí</string>
-  <string name="new_end">Nová sada</string>
-  <string name="distribution">Rozloženie</string>
-  <string name="count">Počet</string>
-  <string name="diameter">Priemer</string>
-  <string name="input">Vstup</string>
-  <string name="target_zoom">Cieľová úroveň priblíženia</string>
-  <string name="action_pdf">Exportovať ako PDF</string>
-  <string name="arrow_diameter_scale">Stupnica priemerov šípov</string>
-  <string name="timestamp">Časová značka</string>
-  <string name="change_target_face">Zmeniť vzhľad terča</string>
-  <string name="your_first_training">Váš prvý tréning</string>
-  <string name="grouping">Zoskupovanie</string>
-  <string name="show_clusters">Klastre</string>
-  <string name="first_training_description">Ťuknite na ikonu plus pre začatie nového tréningu.</string>
-  <string name="show_average">Priemer</string>
-  <string name="show_none">Žiadny</string>
-  <string name="left_handed">Na ľavej strane</string>
-  <string name="right_handed">Na pravej strane</string>
-  <string name="keyboard">Klávesnica</string>
-  <string name="backup_drive_desc">Zálohovanie dát vám umožňuje obnoviť všetky vaše tréningy v prípade straty alebo zmeny vášho telefónu.</string>
-  <string name="backup_now">Zálohovať teraz</string>
-  <string name="last_backup">Posledná záloha: %s</string>
-  <string name="recent_backups">Nedávne zálohy</string>
-  <string name="dialog_restore_title">Vrátiť na predchádzajúcu verziu</string>
-  <string name="restore_desc">Obnova údajov prepíše všetky vaše existujúce údaje zo zálohy.</string>
-  <string name="backup_details">Detaily zálohy</string>
-  <string name="restore">Obnoviť</string>
-  <string name="backup_location">Umiestnenie zálohy</string>
-  <string name="internal_storage">Vnútorné úložisko</string>
-  <string name="automatic_backup">Automatické zálohovanie</string>
-  <string name="restoring">Obnova zo zálohy…</string>
-  <string name="restore_failed">Obnova zlyhala</string>
-  <string name="delete_failed">Zmazanie zlyhalo</string>
-  <string name="backup_restore_desc">Zálohovanie a obnovenie údajov aplikácie</string>
-  <string name="exporting">Exportuje…</string>
-  <string name="loading_backups_failed">Načítanie záloh zlyhalo!</string>
-  <string name="external_storage">Externé úložisko</string>
-  <string name="backup_interval">Interval zálohovania</string>
-  <string name="daily">Denne</string>
-  <string name="weekly">Týždenne</string>
-  <string name="monthly">Mesačne</string>
-  <string name="connection_failed">Pripojenie zlyhalo!</string>
-  <string name="shooting_indoor">Streľba v hale</string>
-  <string name="bow_rest_vertical_position">Zvislá poloha</string>
-  <string name="bow_rest">Základka</string>
-  <string name="bow_rest_horizontal_position">Vodorovná poloha</string>
-  <string name="bow_cam_settings">Nastavenia kamery</string>
-  <string name="bow_letoff_weight">Výška vypustenia</string>
-  <string name="bow_nocking_point">Lôžko</string>
-  <string name="bow_string">Tetiva</string>
-  <string name="bow_scope_magnification">Priblíženie zameriavača</string>
-  <string name="bow_rest_stiffness">Tuhosť</string>
-  <string name="bow_button">Opierka</string>
-  <string name="more_fields">Viac atribútov</string>
-  <string name="recently_used">Nedávno použité</string>
-  <string name="intro_title_track_training_progress">Zabudnite na papierové bodovačky!</string>
-  <string name="intro_description_track_training_progress">S presným vykreslením polohy šípu,\nmôžete získať väčší prehľad\nz vašich tréningových údajov.</string>
-  <string name="intro_title_everything_in_one_place">Všetko, čo potrebujete\nna jednom mieste</string>
-  <string name="intro_description_everything_in_one_place">Vrátane správy - luku\n - šípov a zameriavača,\nlukostreleckých hodín, štatistiky \na oveľa viac…</string>
-  <string name="average_arrow_score_per_end">Priemerné skóre šípov za sadu</string>
-  <string name="show_end">Zobraziť sadu</string>
-  <string name="show_round">Zobraziť kolo</string>
-  <string name="show_training">Zobraziť tréning</string>
-  <string name="summary">Súhrn</string>
-  <string name="end">Sada</string>
-  <string name="average_of">Priemer za</string>
-  <string name="displayed_shots">Zobrazené zásahy</string>
-  <string name="invalid_decimal_number">Neplatné desatinné číslo</string>
-  <string name="not_within_expected_range_mm">Nie je v rámci očakávaného rozsahu 1 až 20 mm</string>
-  <string name="not_within_expected_range_inch">Nie je v rámci očakávaného rozsahu 0 až 1 palec</string>
-  <string name="next_round">Ďalšie kolo</string>
-  <string name="previous_round">Predchádzajúce kolo</string>
-  <string name="overview">Prehľad</string>
-  <string name="score">Skóre</string>
-  <string name="show_reached_score">Zobraziť dosiahnuté skóre</string>
-  <string name="show_total_score">Zobraziť celkové skóre</string>
-  <string name="show_percentage">Zobraziť percento</string>
-  <string name="show_arrow_average">Zobraziť priemer na šíp</string>
-  <string name="image_deleted">Obrázok vymazaný</string>
-  <string name="delete_image">Odstrániť obrázok?</string>
-  <string name="keyboard_type">Typ klávesnice</string>
-  <string name="keyboard_enabled">Klávesnica zapnutá</string>
-  <string name="sort_shots">Zotriediť strely</string>
-  <string name="sort_shots_for_spots">Zotriediť strely pre bodové terče</string>
-  <string name="target_captain">Terčový kapitán</string>
-  <string name="language">Jazyk</string>
-  <string name="warning_backup_experimental">Upozornenie: Táto funkcia je stále experimentálna! Prosím, kontrolujte v pravidelných intervaloch či bola záloha skutočne úspešná!</string>
-  <string name="drawer_open">Otvoriť zásuvku</string>
-  <string name="drawer_close">Zatvoriť zásuvku</string>
-  <string name="help">Pomoc</string>
-  <string name="home">Domov</string>
-  <string name="click_to_enter_profile">Kliknite na zadanie informácií o profile</string>
-  <string name="no_trainings">Zatiaľ ešte nemáte žiadne tréningy!</string>
-  <string name="no_bows">Žiadne luky</string>
-  <string name="no_arrows">Žiadne šípy</string>
-  <string name="version_info">Info o verzii</string>
-  <string name="version_prefix">Verzia</string>
-  <string name="max_arrow_number">Maximálne číslo šípu</string>
-  <string name="distances">Vzdialenosti</string>
-  <string name="diameters">Priemery</string>
-  <string name="bows">Luky</string>
-  <string name="reset">Vynulovať</string>
-  <string name="end_x_of_y">Sada %1$d/%2$d</string>
-  <string name="round_x_of_y">Kolo %1$d/%2$d</string>
-  <string name="settings_summary_timer">Nastaviť správanie časovača lukostreľby</string>
-  <string name="settings_summary_scoreboard">Zmena vzhľadu tabuľky výsledkov</string>
-  <string name="settings_summary_input">Prispôsobiť obrazovky zadávania</string>
-  <string name="settings_summary_overview">Prispôsobiť informácie zobrazené pre tréningy, sady a kolá</string>
-  <string name="settings_summary_profile">Zadanie osobných informácií</string>
-  <string name="licence_number">Číslo licencie</string>
-  <string name="file_type">Typ súboru</string>
-  <string name="clear">Vyčistiť</string>
-  <string name="tap_to_sign">Ťuknite pre prihlásenie</string>
-  <string name="pdf_file">Súbor PDF</string>
-  <string name="image_file">Obrázok</string>
-  <string name="settings_summary_statistics">Upraviť obrazovku štatistiky</string>
-  <string name="settings_statistics_spots_to_single_target">Agregovať body do jedného terča</string>
-  <string name="keep_above_lockscreen">Ponechať nad uzamykacou obrazovkou</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Možnosti</string>
+    <string name="settings">Nastavenia</string>
+    <string name="prev">Predchádzajúca</string>
+    <string name="next">Nasledujúca</string>
+    <string name="save">Uložiť</string>
+    <string name="custom">Voliteľné</string>
+    <string name="training">Tréning</string>
+    <string name="bow">Luk</string>
+    <string name="arrow">Šíp</string>
+    <string name="round">Kolo</string>
+    <string name="points">Body</string>
+    <string name="passe">Sada</string>
+    <!-- Overview -->
+    <string name="new_training">Nový tréning</string>
+    <string name="new_bow">Nový luk</string>
+    <string name="new_arrow">Nové šípy</string>
+    <string name="new_round">Nové kolo</string>
+    <plurals name="training_selected">
+        <item quantity="one">Vybraný tréning: %d</item>
+        <item quantity="few">Vybrané tréningy: %d</item>
+        <item quantity="many">%d trainings selected</item>
+        <item quantity="other">Vybraných tréningov: %d</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">Vybraný luk: %d</item>
+        <item quantity="few">Vybrané luky: %d</item>
+        <item quantity="many">%d bows selected</item>
+        <item quantity="other">Vybraných lukov: %d</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">Vybraný šíp: %d</item>
+        <item quantity="few">Vybrané šípy: %d</item>
+        <item quantity="many">%d arrows selected</item>
+        <item quantity="other">Vybraných šípov: %d</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d sada zvolená</item>
+        <item quantity="few">Vybrané sady: %d</item>
+        <item quantity="many">%d ends selected</item>
+        <item quantity="other">Vybraných sád: %d</item>
+    </plurals>
+    <string name="edit">Upraviť</string>
+    <string name="delete">Vymazať</string>
+    <string name="statistic">Štatistika</string>
+    <!-- Share -->
+    <string name="share">Zdieľať</string>
+    <string name="dispersion_pattern">Rozptyl</string>
+    <string name="sharing_failed">Zdieľanie zlyhalo!</string>
+    <!-- Export -->
+    <string name="send_exported">Poslať exportované údaje</string>
+    <string name="exporting_failed">Exportovanie zlyhalo!</string>
+    <!-- New bow -->
+    <string name="add_bow">Pridať luk</string>
+    <string name="name">Meno</string>
+    <string name="bow_type">Luk typu</string>
+    <string name="properties">Vlastnosti</string>
+    <string name="brand">Značka</string>
+    <string name="size">Veľkosť</string>
+    <string name="description">Popis</string>
+    <string name="height">Vzdialenosť tetivy</string>
+    <string name="tiller">Tiler</string>
+    <string name="sight_settings">Nastavenie zameriavača</string>
+    <string name="add">Pridať</string>
+    <string name="take_picture">Odfotiť</string>
+    <string name="pick_from_gallery">Vybrať obrázok z galérie</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Pridať šíp</string>
+    <string name="length">Dĺžka</string>
+    <string name="spine">Tvrdosť</string>
+    <string name="weight">Váha</string>
+    <string name="vanes">Krídielka</string>
+    <string name="nock">Končík</string>
+    <string name="material">Materiál</string>
+    <!-- New round -->
+    <string name="title">Názov</string>
+    <string name="outdoor">Vonku</string>
+    <string name="indoor">Hala</string>
+    <string name="distance">Vzdialenosť</string>
+    <string name="format">Formát</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d sada</item>
+        <item quantity="few">Sady: %d</item>
+        <item quantity="many">%d ends</item>
+        <item quantity="other">Sád: %d</item>
+    </plurals>
+    <string name="with">z</string>
+    <plurals name="arrow">
+        <item quantity="one">%d šíp</item>
+        <item quantity="few">%d šípy</item>
+        <item quantity="many">%d arrows</item>
+        <item quantity="other">%d šípov</item>
+    </plurals>
+    <string name="target_face">Typ terča</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Tabuľka výsledkov</string>
+    <string name="arrows">Šípy</string>
+    <string name="sum">Súčet</string>
+    <string name="carry">Kumulatív</string>
+    <string name="action_print">Tlačiť</string>
+    <string name="average">Priemer</string>
+    <!-- Input mode -->
+    <string name="comment">Komentár</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Vybrať súbor</string>
+    <string name="dir_not_created">Adresár nebolo možné vytvoriť!</string>
+    <string name="import_failed">Import bol neúspešný!</string>
+    <string name="file_not_found">Súbor sa nenašiel!</string>
+    <string name="failed_reading_file">Zlyhalo čítanie súboru!</string>
+    <!-- Donate -->
+    <string name="donate_2">Darujte mi hamburger</string>
+    <string name="donate_5">Darujte mi kebab</string>
+    <string name="donate_10">Darujte mi veľkú pizzu</string>
+    <string name="donate_20">Darujte mi nejaké palivo</string>
+    <string name="donation_thank">Vďaka za Vašu podporu!</string>
+    <string name="donate_text" formatted="false">Suma je vrátane DPH a 30% poplatkov pre Google. Prípadne ma môžete obdarovať cez PayPal účet dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Časovač</string>
+    <string name="touch_to_start">Stlačiť pre štart</string>
+    <string name="preparation">Pripravte sa</string>
+    <string name="shooting">Streľba</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Čas streľby</string>
+    <string name="timer_waiting_time">Čas prípravy</string>
+    <string name="timer_warning_time">Čas upozornenia</string>
+    <string name="timer_sound">Zvuk</string>
+    <string name="timer_vibrate">Vibrovať</string>
+    <!-- Settings -->
+    <string name="backup_action">Záloha</string>
+    <string name="import_action">Importovať</string>
+    <string name="exports_as_csv">Vyexportovať ako csv</string>
+    <string name="licences">Open Source licencie</string>
+    <string name="licences_summary">Právne poznámky na licenciu</string>
+    <string name="version">Verzia %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekunda</item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d sekúnd</item>
+    </plurals>
+    <string name="info">Informácie</string>
+    <string name="data">Dáta</string>
+    <string name="weather">Počasie</string>
+    <string name="environment">Prostredie</string>
+    <string name="wind_speed">Rýchlosť vetra</string>
+    <string name="wind_direction">Smer vetra</string>
+    <string name="sight_setting_removed">Nastavenie zameriavača vymazané!</string>
+    <string name="metric">Metrické</string>
+    <string name="imperial">Imperiálne</string>
+    <string name="undo">Späť</string>
+    <string name="standard_rounds">Štandardné kolá</string>
+    <string name="expand_collapse">Rozbaliť alebo zbaliť</string>
+    <string name="new_round_template">Nová šablóna</string>
+    <string name="arrow_numbers">Čísla šípov</string>
+    <string name="round_removed">Kolo vymazané!</string>
+    <string name="custom_round">Vlastné kolo</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klub</string>
+    <string name="target">Terč</string>
+    <string name="standard_round">Štandardné kolo</string>
+    <string name="use_as_template">Použiť ako šablónu?</string>
+    <string name="create_copy">Jedná sa o štandardné kolo! \nChcete vytvoriť kópiu, aby ste ho mohli upraviť?</string>
+    <string name="practice">Tréning</string>
+    <string name="edit_training">Upraviť tréning</string>
+    <string name="edit_standard_round">Úprava štandardného kola</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d šíp odstránený</item>
+        <item quantity="few">%d šípy odstránené</item>
+        <item quantity="many">%d arrows deleted</item>
+        <item quantity="other">%d šípov odstránených</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d odstránený luk</item>
+        <item quantity="few">%d odstránené luky</item>
+        <item quantity="many">%d bows deleted</item>
+        <item quantity="other">%d odstránených lukov</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">Odstránený tréning: %d</item>
+        <item quantity="few">Odstránené tréningy: %d</item>
+        <item quantity="many">%d trainings deleted</item>
+        <item quantity="other">Odstránených tréningov: %d</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d sada odstránená</item>
+        <item quantity="few">Odstránené sady: %d</item>
+        <item quantity="many">%d ends deleted</item>
+        <item quantity="other">Odstránených sád: %d</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Kolo %d</item>
+        <item quantity="few">Kolo %d</item>
+        <item quantity="many">Round %d</item>
+        <item quantity="other">Kolá %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">Vybraté %d kolo</item>
+        <item quantity="few">Vybraté %d kolá</item>
+        <item quantity="many">%d rounds selected</item>
+        <item quantity="other">Vybratých %d kôl</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">Zmazané %d kolo</item>
+        <item quantity="few">Zmazané %d kolá</item>
+        <item quantity="many">%d rounds deleted</item>
+        <item quantity="other">Zmazaných %d kôl</item>
+    </plurals>
+    <string name="date">Dátum</string>
+    <string name="edit_round">Upraviť kolo</string>
+    <string name="draw_weight">Sila náťahu</string>
+    <string name="sight">Zameriavač</string>
+    <string name="limbs">Ramená</string>
+    <string name="my_bow">Môj luk</string>
+    <string name="my_arrow">Moje šípy</string>
+    <string name="tip_weight">Váha hrotu</string>
+    <string name="arrow_ranking">Hodnotenie šípu</string>
+    <string name="arrow_x_of_set_of_arrows">Šíp %1$s z %2$s</string>
+    <string name="display">Zobraziť</string>
+    <string name="print">Tlačiť</string>
+    <string name="table">Tabuľka</string>
+    <string name="comments">Komentáre</string>
+    <string name="show_points_colored">Zobraziť body farebne</string>
+    <string name="stabilizer">Stabilizátor</string>
+    <string name="clicker">Klapačka</string>
+    <string name="arrow_number_x">Š9po číslo %s</string>
+    <string name="training_with_standard_round">Tréning so štandardným kolom</string>
+    <string name="free_training">Voľný tréning</string>
+    <string name="competition">Súťaž</string>
+    <string name="about">O aplikácii</string>
+    <string name="general">Všeobecné</string>
+    <string name="contribute">Prispieť</string>
+    <string name="connect">Pripojiť</string>
+    <string name="special_thanks_to">Špeciálne poďakovanie patrí</string>
+    <string name="all_translators">Všetci čo pomohli s prekladom aplikácie!</string>
+    <string name="all_beta_testers">Každý kto sa pridal do skupiny beta testovania a tým prispieva ku priebežnému zlepšovaniu aplikácie.</string>
+    <string name="test_beta">Otestovať najnovšiu beta verziu</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Zdieľať so svojimi kamarátmi</string>
+    <string name="donate">Prispieť</string>
+    <string name="donate_via_paypal">Prispieť cez PayPal</string>
+    <string name="translate_crowdin">Preložiť v Crowdin-e</string>
+    <string name="network_linkedin">Sieť v LinkedIn</string>
+    <string name="search">Hľadať</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Celý tréning</string>
+    <string name="show_shots_round">Aktuálne kolo</string>
+    <string name="show_shots_end">Aktuálna sada</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Narodeniny</string>
+    <string name="first_name">Meno</string>
+    <string name="last_name">Priezvisko</string>
+    <string name="age">Vek</string>
+    <string name="show_signature">Podpis</string>
+    <string name="archer">Lukostrelec</string>
+    <string name="hits">Zásahov</string>
+    <string name="misses">Minutí</string>
+    <string name="new_end">Nová sada</string>
+    <string name="distribution">Rozloženie</string>
+    <string name="count">Počet</string>
+    <string name="diameter">Priemer</string>
+    <string name="input">Vstup</string>
+    <string name="target_zoom">Cieľová úroveň priblíženia</string>
+    <string name="action_pdf">Exportovať ako PDF</string>
+    <string name="arrow_diameter_scale">Škála priemeru šípu</string>
+    <string name="timestamp">Časová značka</string>
+    <string name="change_target_face">Zmeniť typ terča</string>
+    <string name="your_first_training">Váš prvý tréning</string>
+    <string name="grouping">Zoskupovanie</string>
+    <string name="show_clusters">Klastre</string>
+    <string name="first_training_description">Ťuknite na ikonu plus pre začatie nového tréningu.</string>
+    <string name="show_average">Priemer</string>
+    <string name="show_none">Žiadny</string>
+    <string name="left_handed">Na ľavej strane</string>
+    <string name="right_handed">Na pravej strane</string>
+    <string name="keyboard">Klávesnica</string>
+    <string name="backup_drive_desc">Zálohovanie dát vám umožňuje obnoviť všetky vaše tréningy v prípade straty alebo zmeny vášho telefónu.</string>
+    <string name="backup_now">Zálohovať teraz</string>
+    <string name="last_backup">Posledná záloha: %s</string>
+    <string name="recent_backups">Nedávne zálohy</string>
+    <string name="dialog_restore_title">Vrátiť na predchádzajúcu verziu</string>
+    <string name="restore_desc">Obnova údajov prepíše všetky vaše existujúce údaje zo zálohy.</string>
+    <string name="backup_details">Detaily zálohy</string>
+    <string name="restore">Obnoviť</string>
+    <string name="backup_location">Umiestnenie zálohy</string>
+    <string name="internal_storage">Vnútorné úložisko</string>
+    <string name="automatic_backup">Automatické zálohovanie</string>
+    <string name="restoring">Obnova zo zálohy…</string>
+    <string name="restore_failed">Obnova zlyhala</string>
+    <string name="delete_failed">Zmazanie zlyhalo</string>
+    <string name="backup_restore_desc">Zálohovanie a obnovenie údajov aplikácie</string>
+    <string name="exporting">Exportuje…</string>
+    <string name="loading_backups_failed">Načítanie záloh zlyhalo!</string>
+    <string name="external_storage">Externé úložisko</string>
+    <string name="backup_interval">Interval zálohovania</string>
+    <string name="daily">Denne</string>
+    <string name="weekly">Týždenne</string>
+    <string name="monthly">Mesačne</string>
+    <string name="connection_failed">Pripojenie zlyhalo!</string>
+    <string name="shooting_indoor">Streľba v hale</string>
+    <string name="bow_rest_vertical_position">Zvislá poloha</string>
+    <string name="bow_rest">Základka</string>
+    <string name="bow_rest_horizontal_position">Vodorovná poloha</string>
+    <string name="bow_cam_settings">Nastavenia kamery</string>
+    <string name="bow_letoff_weight">Výška vypustenia</string>
+    <string name="bow_nocking_point">Lôžko</string>
+    <string name="bow_string">Tetiva</string>
+    <string name="bow_scope_magnification">Priblíženie zameriavača</string>
+    <string name="bow_rest_stiffness">Tuhosť</string>
+    <string name="bow_button">Opierka</string>
+    <string name="more_fields">Viac atribútov</string>
+    <string name="recently_used">Nedávno použité</string>
+    <string name="intro_title_track_training_progress">Zabudnite na papierové bodovačky!</string>
+    <string name="intro_description_track_training_progress">S presným vykreslením polohy šípu,\nmôžete získať väčší prehľad\nz vašich tréningových údajov.</string>
+    <string name="intro_title_everything_in_one_place">Všetko, čo potrebujete\nna jednom mieste</string>
+    <string name="intro_description_everything_in_one_place">Vrátane správy - luku\n - šípov a zameriavača,\nlukostreleckých hodín, štatistiky \na oveľa viac…</string>
+    <string name="average_arrow_score_per_end">Priemerné skóre šípov za sadu</string>
+    <string name="show_end">Zobraziť sadu</string>
+    <string name="show_round">Zobraziť kolo</string>
+    <string name="show_training">Zobraziť tréning</string>
+    <string name="summary">Súhrn</string>
+    <string name="end">Sada</string>
+    <string name="average_of">Priemer za</string>
+    <string name="displayed_shots">Zobrazené zásahy</string>
+    <string name="invalid_decimal_number">Neplatné desatinné číslo</string>
+    <string name="not_within_expected_range_mm">Nie je v rámci očakávaného rozsahu 1 až 20 mm</string>
+    <string name="not_within_expected_range_inch">Nie je v rámci očakávaného rozsahu 0 až 1 palec</string>
+    <string name="next_round">Ďalšie kolo</string>
+    <string name="previous_round">Predchádzajúce kolo</string>
+    <string name="overview">Prehľad</string>
+    <string name="score">Skóre</string>
+    <string name="show_reached_score">Zobraziť dosiahnuté skóre</string>
+    <string name="show_total_score">Zobraziť celkové skóre</string>
+    <string name="show_percentage">Zobraziť percento</string>
+    <string name="show_arrow_average">Zobraziť priemer na šíp</string>
+    <string name="image_deleted">Obrázok vymazaný</string>
+    <string name="delete_image">Odstrániť obrázok?</string>
+    <string name="keyboard_type">Typ klávesnice</string>
+    <string name="keyboard_enabled">Klávesnica zapnutá</string>
+    <string name="sort_shots">Zotriediť strely</string>
+    <string name="sort_shots_for_spots">Zotriediť strely pre bodové terče</string>
+    <string name="target_captain">Terčový kapitán</string>
+    <string name="language">Jazyk</string>
+    <string name="warning_backup_experimental">Upozornenie: Táto funkcia je stále experimentálna! Prosím, kontrolujte v pravidelných intervaloch či bola záloha skutočne úspešná!</string>
+    <string name="drawer_open">Otvoriť zásuvku</string>
+    <string name="drawer_close">Zatvoriť zásuvku</string>
+    <string name="help">Pomoc</string>
+    <string name="home">Domov</string>
+    <string name="click_to_enter_profile">Kliknite na zadanie informácií o profile</string>
+    <string name="no_trainings">Zatiaľ ešte nemáte žiadne tréningy!</string>
+    <string name="no_bows">Žiadne luky</string>
+    <string name="no_arrows">Žiadne šípy</string>
+    <string name="version_info">Info o verzii</string>
+    <string name="version_prefix">Verzia</string>
+    <string name="max_arrow_number">Maximálne číslo šípu</string>
+    <string name="distances">Vzdialenosti</string>
+    <string name="diameters">Priemery</string>
+    <string name="bows">Luky</string>
+    <string name="reset">Vynulovať</string>
+    <string name="end_x_of_y">Sada %1$d/%2$d</string>
+    <string name="round_x_of_y">Kolo %1$d/%2$d</string>
+    <string name="settings_summary_timer">Nastaviť správanie časovača lukostreľby</string>
+    <string name="settings_summary_scoreboard">Zmena vzhľadu tabuľky výsledkov</string>
+    <string name="settings_summary_input">Prispôsobiť obrazovky zadávania</string>
+    <string name="settings_summary_overview">Prispôsobiť informácie zobrazené pre tréningy, sady a kolá</string>
+    <string name="settings_summary_profile">Zadanie osobných informácií</string>
+    <string name="licence_number">Číslo licencie</string>
+    <string name="file_type">Typ súboru</string>
+    <string name="clear">Vyčistiť</string>
+    <string name="tap_to_sign">Ťuknite pre prihlásenie</string>
+    <string name="pdf_file">Súbor PDF</string>
+    <string name="image_file">Obrázok</string>
+    <string name="settings_summary_statistics">Upraviť obrazovku štatistiky</string>
+    <string name="settings_statistics_spots_to_single_target">Agregovať body do jedného terča</string>
+    <string name="keep_above_lockscreen">Ponechať nad uzamykacou obrazovkou</string>
+    <string name="scoreboard_title_all_rounds">Všetky kolá</string>
+    <string name="permission_required">Vyžaduje sa povolenie</string>
+    <string name="backup_permission_explanation"><![CDATA[Aby bolo možné vytvoriť zálohu vašich dát, aplikácia potrebuje povolenie na prístup do internej pamäte telefónu. Pre použitie zálohovania prejdite do Systémových nastavení > Aplikácie > MyTargets > Povolenia a povoľte položku \'Úložisko(Storage)\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 784da05af..435e8e878 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Možnosti</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Nazaj</string>
-  <string name="next">Naprej</string>
-  <string name="save">Shrani</string>
-  <string name="custom">Po meri</string>
-  <string name="training">Trening</string>
-  <string name="bow">Lok</string>
-  <string name="arrow">Pušèica</string>
-  <string name="round">Krog</string>
-  <string name="points">Toèke</string>
-  <string name="passe">Serija</string>
-  <!-- Overview -->
-  <string name="new_training">Nov trening</string>
-  <string name="new_bow">Nov lok</string>
-  <string name="new_arrow">Nova pušèica</string>
-  <string name="new_round">Nov Krog</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d trening selected</item>
-    <item quantity="two">%d treninga selected</item>
-    <item quantity="few">%d treningov selected</item>
-    <item quantity="other">%d treningi selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d lok selected</item>
-    <item quantity="two">%d loka selected</item>
-    <item quantity="few">%d lokov selected</item>
-    <item quantity="other">%d loki selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d pušèica selected</item>
-    <item quantity="two">%d pušèice selected</item>
-    <item quantity="few">%d pušèic selected</item>
-    <item quantity="other">%d pušèice selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d serija selected</item>
-    <item quantity="two">%d seriji selected</item>
-    <item quantity="few">%d serij selected</item>
-    <item quantity="other">%d serije selected</item>
-  </plurals>
-  <string name="edit">Urejanje</string>
-  <string name="delete">izbriši</string>
-  <string name="statistic">Statistika</string>
-  <!-- Share -->
-  <string name="share">Deli</string>
-  <string name="dispersion_pattern">Razporeditov zadetkov</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Pošlji izvožene podatke</string>
-  <string name="exporting_failed">Pošiljanje izvoženih podatkov je bilo neuspešno!</string>
-  <!-- New bow -->
-  <string name="add_bow">Dodaj lok</string>
-  <string name="name">Ime</string>
-  <string name="bow_type">Vrsta loka</string>
-  <string name="properties">Lastnosti</string>
-  <string name="brand">Proizvajalec</string>
-  <string name="size">Velikost</string>
-  <string name="description">Opis</string>
-  <string name="height">Višina tetive</string>
-  <string name="tiller">Tiler</string>
-  <string name="sight_settings">Nastavitve merilne naprave</string>
-  <string name="add">Dodaj</string>
-  <string name="take_picture">Posnemi fotografijo</string>
-  <string name="pick_from_gallery">Izberi sliko iz albuma</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Dodaj pušèico</string>
-  <string name="length">Dolžina</string>
-  <string name="spine">Trdota</string>
-  <string name="weight">Teža</string>
-  <string name="vanes">Peresa</string>
-  <string name="nock">Jahaè</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Ime treninga</string>
-  <string name="outdoor">Zunanje</string>
-  <string name="indoor">Dvoransko</string>
-  <string name="distance">Razdalja</string>
-  <string name="format">Kolièina</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d serija</item>
-    <item quantity="two">%d seriji</item>
-    <item quantity="few">%d serij</item>
-    <item quantity="other">%d serije</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="one">%d pušèica</item>
-    <item quantity="two">%d pušèice</item>
-    <item quantity="few">%d pušèic</item>
-    <item quantity="other">%d pušèice</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard"> Tabela z rezultat</string>
-  <string name="arrows">Zadetki</string>
-  <string name="sum">Vsota</string>
-  <string name="carry">Skupaj</string>
-  <string name="action_print">Natisni</string>
-  <string name="average">Povpreèje</string>
-  <!-- Input mode -->
-  <string name="comment">Komentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Izberi datoteko</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Uvažanje je neuspešno!</string>
-  <string name="file_not_found">Datoteka ni bila najdena!</string>
-  <string name="failed_reading_file">Datoteke ni mogoèe prebrati!</string>
-  <!-- Donate -->
-  <string name="donate_2">Doniraj mi burger</string>
-  <string name="donate_5">Doniraj mi kebab</string>
-  <string name="donate_10">Doniraj mi veliko pico</string>
-  <string name="donate_20">Doniraj mi nekaj goriva</string>
-  <string name="donation_thank">Hvala za vašo podporo!</string>
-  <string name="donate_text" formatted="false"> V donacijo je vkljuèen DDV in 30% pristojbine za Google. Zaželjena alternativa je donacija preko PayPal na raèun dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Odštevalnik</string>
-  <string name="touch_to_start">Za zaèetek se dotakni zaslona</string>
-  <string name="preparation">Pozor</string>
-  <string name="shooting">Streljaj</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Èas za streljanje</string>
-  <string name="timer_waiting_time">Èas za pripravo na strel</string>
-  <string name="timer_warning_time">opozorilna rumena luè</string>
-  <string name="timer_sound">Zvok</string>
-  <string name="timer_vibrate">Vibriranje</string>
-  <!-- Settings -->
-  <string name="backup_action">Varnostna kopija</string>
-  <string name="import_action">Uvozi</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Licence</string>
-  <string name="licences_summary">Pravna obvestila</string>
-  <string name="version">Verzija %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekunda</item>
-    <item quantity="two">%d sekundi</item>
-    <item quantity="few">%d sekund</item>
-    <item quantity="other">%d sekunde</item>
-  </plurals>
-  <string name="info">Informacije</string>
-  <string name="data">Podatki</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Razveljavi</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="two">%d arrows deleted</item>
-    <item quantity="few">%d arrows deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="two">%d bows deleted</item>
-    <item quantity="few">%d bows deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="two">%d trainings deleted</item>
-    <item quantity="few">%d trainings deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="two">%d ends deleted</item>
-    <item quantity="few">%d ends deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="two">Round %d</item>
-    <item quantity="few">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="two">%d rounds selected</item>
-    <item quantity="few">%d rounds selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="two">%d rounds deleted</item>
-    <item quantity="few">%d rounds deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Serija %1$d/%2$d</string>
-  <string name="round_x_of_y">Krog %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Možnosti</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Nazaj</string>
+    <string name="next">Naprej</string>
+    <string name="save">Shrani</string>
+    <string name="custom">Po meri</string>
+    <string name="training">Trening</string>
+    <string name="bow">Lok</string>
+    <string name="arrow">Pušèica</string>
+    <string name="round">Krog</string>
+    <string name="points">Toèke</string>
+    <string name="passe">Serija</string>
+    <!-- Overview -->
+    <string name="new_training">Nov trening</string>
+    <string name="new_bow">Nov lok</string>
+    <string name="new_arrow">Nova pušèica</string>
+    <string name="new_round">Nov Krog</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d trening selected</item>
+        <item quantity="two">%d treninga selected</item>
+        <item quantity="few">%d treningov selected</item>
+        <item quantity="other">%d treningi selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d lok selected</item>
+        <item quantity="two">%d loka selected</item>
+        <item quantity="few">%d lokov selected</item>
+        <item quantity="other">%d loki selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d pušèica selected</item>
+        <item quantity="two">%d pušèice selected</item>
+        <item quantity="few">%d pušèic selected</item>
+        <item quantity="other">%d pušèice selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d serija selected</item>
+        <item quantity="two">%d seriji selected</item>
+        <item quantity="few">%d serij selected</item>
+        <item quantity="other">%d serije selected</item>
+    </plurals>
+    <string name="edit">Urejanje</string>
+    <string name="delete">izbriši</string>
+    <string name="statistic">Statistika</string>
+    <!-- Share -->
+    <string name="share">Deli</string>
+    <string name="dispersion_pattern">Razporeditov zadetkov</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Pošlji izvožene podatke</string>
+    <string name="exporting_failed">Pošiljanje izvoženih podatkov je bilo neuspešno!</string>
+    <!-- New bow -->
+    <string name="add_bow">Dodaj lok</string>
+    <string name="name">Ime</string>
+    <string name="bow_type">Vrsta loka</string>
+    <string name="properties">Lastnosti</string>
+    <string name="brand">Proizvajalec</string>
+    <string name="size">Velikost</string>
+    <string name="description">Opis</string>
+    <string name="height">Višina tetive</string>
+    <string name="tiller">Tiler</string>
+    <string name="sight_settings">Nastavitve merilne naprave</string>
+    <string name="add">Dodaj</string>
+    <string name="take_picture">Posnemi fotografijo</string>
+    <string name="pick_from_gallery">Izberi sliko iz albuma</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Dodaj pušèico</string>
+    <string name="length">Dolžina</string>
+    <string name="spine">Trdota</string>
+    <string name="weight">Teža</string>
+    <string name="vanes">Peresa</string>
+    <string name="nock">Jahaè</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Ime treninga</string>
+    <string name="outdoor">Zunanje</string>
+    <string name="indoor">Dvoransko</string>
+    <string name="distance">Razdalja</string>
+    <string name="format">Kolièina</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d serija</item>
+        <item quantity="two">%d seriji</item>
+        <item quantity="few">%d serij</item>
+        <item quantity="other">%d serije</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="one">%d pušèica</item>
+        <item quantity="two">%d pušèice</item>
+        <item quantity="few">%d pušèic</item>
+        <item quantity="other">%d pušèice</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard"> Tabela z rezultat</string>
+    <string name="arrows">Zadetki</string>
+    <string name="sum">Vsota</string>
+    <string name="carry">Skupaj</string>
+    <string name="action_print">Natisni</string>
+    <string name="average">Povpreèje</string>
+    <!-- Input mode -->
+    <string name="comment">Komentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Izberi datoteko</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Uvažanje je neuspešno!</string>
+    <string name="file_not_found">Datoteka ni bila najdena!</string>
+    <string name="failed_reading_file">Datoteke ni mogoèe prebrati!</string>
+    <!-- Donate -->
+    <string name="donate_2">Doniraj mi burger</string>
+    <string name="donate_5">Doniraj mi kebab</string>
+    <string name="donate_10">Doniraj mi veliko pico</string>
+    <string name="donate_20">Doniraj mi nekaj goriva</string>
+    <string name="donation_thank">Hvala za vašo podporo!</string>
+    <string name="donate_text" formatted="false"> V donacijo je vkljuèen DDV in 30% pristojbine za Google. Zaželjena alternativa je donacija preko PayPal na raèun dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Odštevalnik</string>
+    <string name="touch_to_start">Za zaèetek se dotakni zaslona</string>
+    <string name="preparation">Pozor</string>
+    <string name="shooting">Streljaj</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Èas za streljanje</string>
+    <string name="timer_waiting_time">Èas za pripravo na strel</string>
+    <string name="timer_warning_time">opozorilna rumena luè</string>
+    <string name="timer_sound">Zvok</string>
+    <string name="timer_vibrate">Vibriranje</string>
+    <!-- Settings -->
+    <string name="backup_action">Varnostna kopija</string>
+    <string name="import_action">Uvozi</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Licence</string>
+    <string name="licences_summary">Pravna obvestila</string>
+    <string name="version">Verzija %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekunda</item>
+        <item quantity="two">%d sekundi</item>
+        <item quantity="few">%d sekund</item>
+        <item quantity="other">%d sekunde</item>
+    </plurals>
+    <string name="info">Informacije</string>
+    <string name="data">Podatki</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Razveljavi</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="two">%d arrows deleted</item>
+        <item quantity="few">%d arrows deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="two">%d bows deleted</item>
+        <item quantity="few">%d bows deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="two">%d trainings deleted</item>
+        <item quantity="few">%d trainings deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="two">%d ends deleted</item>
+        <item quantity="few">%d ends deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="two">Round %d</item>
+        <item quantity="few">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="two">%d rounds selected</item>
+        <item quantity="few">%d rounds selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="two">%d rounds deleted</item>
+        <item quantity="few">%d rounds deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Serija %1$d/%2$d</string>
+    <string name="round_x_of_y">Krog %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 51c0cf080..ffcc70048 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -15,369 +15,370 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="few">%d trainings selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="few">%d bows selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="few">%d arrows selected</item>
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="few">%d ends selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d end</item>
-    <item quantity="few">%d ends</item>
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="one">%d arrow</item>
-    <item quantity="few">%d arrows</item>
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="few">%d seconds</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="few">%d arrows deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="few">%d bows deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="few">%d trainings deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="few">%d ends deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Round %d</item>
-    <item quantity="few">Round %d</item>
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d round selected</item>
-    <item quantity="few">%d rounds selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="few">%d rounds deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Options</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Previous</string>
+    <string name="next">Next</string>
+    <string name="save">Save</string>
+    <string name="custom">Custom</string>
+    <string name="training">Training</string>
+    <string name="bow">Bow</string>
+    <string name="arrow">Arrow</string>
+    <string name="round">Round</string>
+    <string name="points">Points</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="few">%d trainings selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="few">%d bows selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d arrow selected</item>
+        <item quantity="few">%d arrows selected</item>
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="few">%d ends selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Share</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Exporting failed!</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Name</string>
+    <string name="bow_type">Bow type</string>
+    <string name="properties">Properties</string>
+    <string name="brand">Brand</string>
+    <string name="size">Size</string>
+    <string name="description">Description</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sight settings</string>
+    <string name="add">Add</string>
+    <string name="take_picture">Take a picture</string>
+    <string name="pick_from_gallery">Select a picture from gallery</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Add arrow</string>
+    <string name="length">Length</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Weight</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d end</item>
+        <item quantity="few">%d ends</item>
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="one">%d arrow</item>
+        <item quantity="few">%d arrows</item>
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Arrows</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Print</string>
+    <string name="average">Average</string>
+    <!-- Input mode -->
+    <string name="comment">Comment</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Select a file</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="few">%d arrows deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="few">%d bows deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="few">%d trainings deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="few">%d ends deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Round %d</item>
+        <item quantity="few">Round %d</item>
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d round selected</item>
+        <item quantity="few">%d rounds selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d round deleted</item>
+        <item quantity="few">%d rounds deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d657f65ea..aedd048c4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Inställningar</string>
-  <string name="settings">Inställningar</string>
-  <string name="prev">Tillbaka</string>
-  <string name="next">Nästa</string>
-  <string name="save">Spara</string>
-  <string name="custom">Anpassad</string>
-  <string name="training">Träning</string>
-  <string name="bow">Pilbåge</string>
-  <string name="arrow">Pil</string>
-  <string name="round">Runda</string>
-  <string name="points">Poäng</string>
-  <string name="passe">Serie</string>
-  <!-- Overview -->
-  <string name="new_training">Ny träning</string>
-  <string name="new_bow">Ny pilbåge</string>
-  <string name="new_arrow">Ny pil</string>
-  <string name="new_round">Ny runda</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d träning vald</item>
-    <item quantity="other">%d träningar valda</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d pilbåge vald</item>
-    <item quantity="other">%d pilbågar valda</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d pil vald</item>
-    <item quantity="other">%d pilar valda</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d avsluta vald</item>
-    <item quantity="other">%d avsluta valda</item>
-  </plurals>
-  <string name="edit">Redigera</string>
-  <string name="delete">Radera</string>
-  <string name="statistic">Statistik</string>
-  <!-- Share -->
-  <string name="share">Dela</string>
-  <string name="dispersion_pattern">Spridningsmönster</string>
-  <string name="sharing_failed">Delning misslyckades!</string>
-  <!-- Export -->
-  <string name="send_exported">Skicka exporterade data</string>
-  <string name="exporting_failed">Exportering misslyckades!</string>
-  <!-- New bow -->
-  <string name="add_bow">Lägg till pilbåge</string>
-  <string name="name">Namn</string>
-  <string name="bow_type">Pilbågs typ</string>
-  <string name="properties">Egenskaper</string>
-  <string name="brand">Märke</string>
-  <string name="size">Storlek</string>
-  <string name="description">Beskrivning</string>
-  <string name="height">Stränghöjd</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Siktesinställningar</string>
-  <string name="add">Lägg tilll</string>
-  <string name="take_picture">Ta en bild</string>
-  <string name="pick_from_gallery">Välj en bild från galleri</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Ny pil</string>
-  <string name="length">Längd</string>
-  <string name="spine">Styvhet</string>
-  <string name="weight">Vikt</string>
-  <string name="vanes">Fenor</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Titel</string>
-  <string name="outdoor">Utomhus</string>
-  <string name="indoor">Inomhus</string>
-  <string name="distance">Avstånd</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d slut</item>
-    <item quantity="other">%d slut</item>
-  </plurals>
-  <string name="with">av</string>
-  <plurals name="arrow">
-    <item quantity="one">%d pil</item>
-    <item quantity="other">%d pilar</item>
-  </plurals>
-  <string name="target_face">Tapet</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Resultattavla</string>
-  <string name="arrows">Pilar</string>
-  <string name="sum">Summa</string>
-  <string name="carry">Delsumma</string>
-  <string name="action_print">Skriv ut</string>
-  <string name="average">Medelvärde</string>
-  <!-- Input mode -->
-  <string name="comment">Kommentar</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Välj fil</string>
-  <string name="dir_not_created">Det gick inte att skapa katalogen!</string>
-  <string name="import_failed">Importering misslyckades!</string>
-  <string name="file_not_found">Filen saknas!</string>
-  <string name="failed_reading_file">Kunde inte öppna filen!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donera till en hamburgare</string>
-  <string name="donate_5">Donera till kebab</string>
-  <string name="donate_10">Donera till en stor pizza</string>
-  <string name="donate_20">Donera till bränsle</string>
-  <string name="donation_thank">Tack för ditt stöd!</string>
-  <string name="donate_text" formatted="false">Beloppen är inkl moms och 30% avgifter för Google. Alternativt kan du gärna donera till PayPal kontot dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Tryck för att starta</string>
-  <string name="preparation">Gör dig redo</string>
-  <string name="shooting">Skjuter</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Skjuttid</string>
-  <string name="timer_waiting_time">Väntetid</string>
-  <string name="timer_warning_time">Varningstid</string>
-  <string name="timer_sound">Ljud</string>
-  <string name="timer_vibrate">Vibrera</string>
-  <!-- Settings -->
-  <string name="backup_action">Säkerhetskopiera</string>
-  <string name="import_action">Återskapa säkerhetskopia</string>
-  <string name="exports_as_csv">Exportera som CSV</string>
-  <string name="licences">Öppen källkod-licenser</string>
-  <string name="licences_summary">Rättsliga anmärkningar på licenser</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="one">%d sekund</item>
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Väder</string>
-  <string name="environment">Miljö</string>
-  <string name="wind_speed">Vindhastighet</string>
-  <string name="wind_direction">Vindriktning</string>
-  <string name="sight_setting_removed">Siktes inställningar raderade!</string>
-  <string name="metric">Metrisk</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Ångra</string>
-  <string name="standard_rounds">Standard rundor</string>
-  <string name="expand_collapse">Förstora/Förminska</string>
-  <string name="new_round_template">Ny mall</string>
-  <string name="arrow_numbers">Pil nummer</string>
-  <string name="round_removed">Runda raderad!</string>
-  <string name="custom_round">Anpassad runda</string>
-  <string name="filter">Filter</string>
-  <string name="club">Klubb</string>
-  <string name="target">Mål</string>
-  <string name="standard_round">Standard runda</string>
-  <string name="use_as_template">Använd en mall?</string>
-  <string name="create_copy">Detta är en standard runda! \nVill du skapa en kopia för att redigera den?</string>
-  <string name="practice">Öva</string>
-  <string name="edit_training">Redigera träning</string>
-  <string name="edit_standard_round">Redigera Standard Runda</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d pil raderad</item>
-    <item quantity="other">%d pilar raderade</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d pilbåge raderad</item>
-    <item quantity="other">%d pilbågar raderade</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d träning raderad</item>
-    <item quantity="other">%d träningar raderade</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d Serie</item>
-    <item quantity="other">%d Serier</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Runda %d</item>
-    <item quantity="other">Rundor %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d omgång vald</item>
-    <item quantity="other">%d omgångar valda</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d omgång raderad</item>
-    <item quantity="other">%d omgångar raderade</item>
-  </plurals>
-  <string name="date">Datum</string>
-  <string name="edit_round">Redigera runda</string>
-  <string name="draw_weight">Dragstyrka</string>
-  <string name="sight">Sikte</string>
-  <string name="limbs">Lemmar</string>
-  <string name="my_bow">Min pilbåge</string>
-  <string name="my_arrow">Min pil</string>
-  <string name="tip_weight">Spetsens vikt</string>
-  <string name="arrow_ranking">Pil rankning</string>
-  <string name="arrow_x_of_set_of_arrows">Pil %1$s av %2$s</string>
-  <string name="display">Skärm</string>
-  <string name="print">Skriv ut</string>
-  <string name="table">Tabell</string>
-  <string name="comments">Kommentarer</string>
-  <string name="show_points_colored">Visa färgade punkter</string>
-  <string name="stabilizer">Stablilisator</string>
-  <string name="clicker">Klicker</string>
-  <string name="arrow_number_x">Pil nummer %s</string>
-  <string name="training_with_standard_round">Träning med standard runda</string>
-  <string name="free_training">Fri träning</string>
-  <string name="competition">Tävlande</string>
-  <string name="about">Om</string>
-  <string name="general">Allnänt</string>
-  <string name="contribute">Bidra</string>
-  <string name="connect">Anslut</string>
-  <string name="special_thanks_to">Speciellt tack till</string>
-  <string name="all_translators">Alla killar, som hjälpte till med att översätta app!</string>
-  <string name="all_beta_testers">Alla som anslutit sig till betatestar gruppen och därför hjälper till att kontinuerligt förbättra appen.</string>
-  <string name="test_beta">Testa den senaste betaversionen</string>
-  <string name="join_on_google_plus">Följ oss på Google+</string>
-  <string name="share_with_friends">Dela med dina vänner</string>
-  <string name="donate">Donera</string>
-  <string name="donate_via_paypal">Donera via PayPal</string>
-  <string name="translate_crowdin">Översätta på Crowdin</string>
-  <string name="network_linkedin">Nätverk på LinkedIn</string>
-  <string name="search">Sök</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Hela träningen</string>
-  <string name="show_shots_round">Nuvarande runda</string>
-  <string name="show_shots_end">Nuvarande omgång</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Födelsedag</string>
-  <string name="first_name">Förnamn</string>
-  <string name="last_name">Efternamn</string>
-  <string name="age">Ålder</string>
-  <string name="show_signature">Signatur</string>
-  <string name="archer">Bågskytt</string>
-  <string name="hits">Träffar</string>
-  <string name="misses">Missar</string>
-  <string name="new_end">Ny omgång</string>
-  <string name="distribution">Fördelning</string>
-  <string name="count">Antal</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Måltavlans zoom-nivå</string>
-  <string name="action_pdf">Exportera som PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Tidsstämpel</string>
-  <string name="change_target_face">Ändra måltavla</string>
-  <string name="your_first_training">Din första träning</string>
-  <string name="grouping">Gruppering</string>
-  <string name="show_clusters">Kluster</string>
-  <string name="first_training_description">Tryck på plusset för att starta en ny träning.</string>
-  <string name="show_average">Snitt</string>
-  <string name="show_none">Ingen</string>
-  <string name="left_handed">Vänsterhänt</string>
-  <string name="right_handed">Högerhänt</string>
-  <string name="keyboard">Tangentbord</string>
-  <string name="backup_drive_desc">Genom att säkerhetskopiera din data kan du återställa alla dina träningar om du skulle förlora dem eller byta telefon.</string>
-  <string name="backup_now">Säkerhetskopiera nu</string>
-  <string name="last_backup">Senaste säkerhetskopieringen: %s</string>
-  <string name="recent_backups">Senaste säkerhetskopiorna</string>
-  <string name="dialog_restore_title">Återställ till föregående version</string>
-  <string name="restore_desc">Genom att återställa datan kommer all befintlig data skrivas över med säkerhetskopian.</string>
-  <string name="backup_details">Backupdetaljer</string>
-  <string name="restore">Återställ</string>
-  <string name="backup_location">Säkerhetskopieringsplats</string>
-  <string name="internal_storage">Intern lagring</string>
-  <string name="automatic_backup">Automatisk säkerhetskopiering</string>
-  <string name="restoring">Återställer säkerhetskopia…</string>
-  <string name="restore_failed">Återställning misslyckades</string>
-  <string name="delete_failed">Borttagning misslyckades</string>
-  <string name="backup_restore_desc">Säkerhetskopiera och återställ appdata</string>
-  <string name="exporting">Exporterar…</string>
-  <string name="loading_backups_failed">Laddning av säkerhetskopior misslyckades!</string>
-  <string name="external_storage">Extern lagring</string>
-  <string name="backup_interval">Säkerhetskopieringsintervall</string>
-  <string name="daily">Daglig</string>
-  <string name="weekly">Veckovis</string>
-  <string name="monthly">Månadsvis</string>
-  <string name="connection_failed">Anslutning misslyckades!</string>
-  <string name="shooting_indoor">Skjuter innomhus</string>
-  <string name="bow_rest_vertical_position">Vertikal position</string>
-  <string name="bow_rest">Pilhylla</string>
-  <string name="bow_rest_horizontal_position">Horisontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nockläge</string>
-  <string name="bow_string">Sträng</string>
-  <string name="bow_scope_magnification">Siktets förstoring</string>
-  <string name="bow_rest_stiffness">Styvhet</string>
-  <string name="bow_button">Knapp</string>
-  <string name="more_fields">Fler fält</string>
-  <string name="recently_used">Nyligen använda</string>
-  <string name="intro_title_track_training_progress">Glöm poängkort av papper!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Språk</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Öppna panel</string>
-  <string name="drawer_close">Stäng panel</string>
-  <string name="help">Hjälp</string>
-  <string name="home">Start</string>
-  <string name="click_to_enter_profile">Klicka för att ange profilinformation</string>
-  <string name="no_trainings">Du har inga träningar ännu!</string>
-  <string name="no_bows">Inga bågar</string>
-  <string name="no_arrows">Inga pilar</string>
-  <string name="version_info">Versionsinfo</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Max antal pilar</string>
-  <string name="distances">Avstånd</string>
-  <string name="diameters">Diameter</string>
-  <string name="bows">Bågar</string>
-  <string name="reset">Återställ</string>
-  <string name="end_x_of_y">Serie %1$d/%2$d</string>
-  <string name="round_x_of_y">Runda %1$d/%2$d</string>
-  <string name="settings_summary_timer">Justera tidtagarens beteende</string>
-  <string name="settings_summary_scoreboard">Ändra resultattavlans utseende</string>
-  <string name="settings_summary_input">Anpassa inmatnings skärmen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Skriv in personlig information</string>
-  <string name="licence_number">Licensnivå</string>
-  <string name="file_type">Filtyp</string>
-  <string name="clear">Rensa</string>
-  <string name="tap_to_sign">Tryck för att signera</string>
-  <string name="pdf_file">PDF-fil</string>
-  <string name="image_file">Bildfil</string>
-  <string name="settings_summary_statistics">Justera statistikskärmen</string>
-  <string name="settings_statistics_spots_to_single_target">Sammanfoga spottar till en tavla</string>
-  <string name="keep_above_lockscreen">Håll ovanför låsskärm</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Behörighet krävs</string>
-  <string name="backup_permission_explanation"><![CDATA[För att kunna göra en säkerhetskopiering av din data så behöver appen behörighet för att komma åt den interna lagringen hos din telefon. För att använda säkerhetskopierings-funktionen, gå till systeminställningar > Appar > MyTargets > behörigheter och aktivera "lagring".]]></string>
+    <!-- General -->
+    <string name="preferences">Inställningar</string>
+    <string name="settings">Inställningar</string>
+    <string name="prev">Tillbaka</string>
+    <string name="next">Nästa</string>
+    <string name="save">Spara</string>
+    <string name="custom">Anpassad</string>
+    <string name="training">Träning</string>
+    <string name="bow">Pilbåge</string>
+    <string name="arrow">Pil</string>
+    <string name="round">Runda</string>
+    <string name="points">Poäng</string>
+    <string name="passe">Serie</string>
+    <!-- Overview -->
+    <string name="new_training">Ny träning</string>
+    <string name="new_bow">Ny pilbåge</string>
+    <string name="new_arrow">Ny pil</string>
+    <string name="new_round">Ny runda</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d träning vald</item>
+        <item quantity="other">%d träningar valda</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d pilbåge vald</item>
+        <item quantity="other">%d pilbågar valda</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d pil vald</item>
+        <item quantity="other">%d pilar valda</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d avsluta vald</item>
+        <item quantity="other">%d avsluta valda</item>
+    </plurals>
+    <string name="edit">Redigera</string>
+    <string name="delete">Radera</string>
+    <string name="statistic">Statistik</string>
+    <!-- Share -->
+    <string name="share">Dela</string>
+    <string name="dispersion_pattern">Spridningsmönster</string>
+    <string name="sharing_failed">Delning misslyckades!</string>
+    <!-- Export -->
+    <string name="send_exported">Skicka exporterade data</string>
+    <string name="exporting_failed">Exportering misslyckades!</string>
+    <!-- New bow -->
+    <string name="add_bow">Lägg till pilbåge</string>
+    <string name="name">Namn</string>
+    <string name="bow_type">Pilbågs typ</string>
+    <string name="properties">Egenskaper</string>
+    <string name="brand">Märke</string>
+    <string name="size">Storlek</string>
+    <string name="description">Beskrivning</string>
+    <string name="height">Stränghöjd</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Siktesinställningar</string>
+    <string name="add">Lägg tilll</string>
+    <string name="take_picture">Ta en bild</string>
+    <string name="pick_from_gallery">Välj en bild från galleri</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Ny pil</string>
+    <string name="length">Längd</string>
+    <string name="spine">Styvhet</string>
+    <string name="weight">Vikt</string>
+    <string name="vanes">Fenor</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Titel</string>
+    <string name="outdoor">Utomhus</string>
+    <string name="indoor">Inomhus</string>
+    <string name="distance">Avstånd</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d slut</item>
+        <item quantity="other">%d slut</item>
+    </plurals>
+    <string name="with">av</string>
+    <plurals name="arrow">
+        <item quantity="one">%d pil</item>
+        <item quantity="other">%d pilar</item>
+    </plurals>
+    <string name="target_face">Tapet</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Resultattavla</string>
+    <string name="arrows">Pilar</string>
+    <string name="sum">Summa</string>
+    <string name="carry">Delsumma</string>
+    <string name="action_print">Skriv ut</string>
+    <string name="average">Medelvärde</string>
+    <!-- Input mode -->
+    <string name="comment">Kommentar</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Välj fil</string>
+    <string name="dir_not_created">Det gick inte att skapa katalogen!</string>
+    <string name="import_failed">Importering misslyckades!</string>
+    <string name="file_not_found">Filen saknas!</string>
+    <string name="failed_reading_file">Kunde inte öppna filen!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donera till en hamburgare</string>
+    <string name="donate_5">Donera till kebab</string>
+    <string name="donate_10">Donera till en stor pizza</string>
+    <string name="donate_20">Donera till bränsle</string>
+    <string name="donation_thank">Tack för ditt stöd!</string>
+    <string name="donate_text" formatted="false">Beloppen är inkl moms och 30% avgifter för Google. Alternativt kan du gärna donera till PayPal kontot dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Tryck för att starta</string>
+    <string name="preparation">Gör dig redo</string>
+    <string name="shooting">Skjuter</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Skjuttid</string>
+    <string name="timer_waiting_time">Väntetid</string>
+    <string name="timer_warning_time">Varningstid</string>
+    <string name="timer_sound">Ljud</string>
+    <string name="timer_vibrate">Vibrera</string>
+    <!-- Settings -->
+    <string name="backup_action">Säkerhetskopiera</string>
+    <string name="import_action">Återskapa säkerhetskopia</string>
+    <string name="exports_as_csv">Exportera som CSV</string>
+    <string name="licences">Öppen källkod-licenser</string>
+    <string name="licences_summary">Rättsliga anmärkningar på licenser</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Väder</string>
+    <string name="environment">Miljö</string>
+    <string name="wind_speed">Vindhastighet</string>
+    <string name="wind_direction">Vindriktning</string>
+    <string name="sight_setting_removed">Siktes inställningar raderade!</string>
+    <string name="metric">Metrisk</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Ångra</string>
+    <string name="standard_rounds">Standard rundor</string>
+    <string name="expand_collapse">Förstora/Förminska</string>
+    <string name="new_round_template">Ny mall</string>
+    <string name="arrow_numbers">Pil nummer</string>
+    <string name="round_removed">Runda raderad!</string>
+    <string name="custom_round">Anpassad runda</string>
+    <string name="filter">Filter</string>
+    <string name="club">Klubb</string>
+    <string name="target">Mål</string>
+    <string name="standard_round">Standard runda</string>
+    <string name="use_as_template">Använd en mall?</string>
+    <string name="create_copy">Detta är en standard runda! \nVill du skapa en kopia för att redigera den?</string>
+    <string name="practice">Öva</string>
+    <string name="edit_training">Redigera träning</string>
+    <string name="edit_standard_round">Redigera Standard Runda</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d pil raderad</item>
+        <item quantity="other">%d pilar raderade</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d pilbåge raderad</item>
+        <item quantity="other">%d pilbågar raderade</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d träning raderad</item>
+        <item quantity="other">%d träningar raderade</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d Serie</item>
+        <item quantity="other">%d Serier</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Runda %d</item>
+        <item quantity="other">Rundor %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d omgång vald</item>
+        <item quantity="other">%d omgångar valda</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d omgång raderad</item>
+        <item quantity="other">%d omgångar raderade</item>
+    </plurals>
+    <string name="date">Datum</string>
+    <string name="edit_round">Redigera runda</string>
+    <string name="draw_weight">Dragstyrka</string>
+    <string name="sight">Sikte</string>
+    <string name="limbs">Lemmar</string>
+    <string name="my_bow">Min pilbåge</string>
+    <string name="my_arrow">Min pil</string>
+    <string name="tip_weight">Spetsens vikt</string>
+    <string name="arrow_ranking">Pil rankning</string>
+    <string name="arrow_x_of_set_of_arrows">Pil %1$s av %2$s</string>
+    <string name="display">Skärm</string>
+    <string name="print">Skriv ut</string>
+    <string name="table">Tabell</string>
+    <string name="comments">Kommentarer</string>
+    <string name="show_points_colored">Visa färgade punkter</string>
+    <string name="stabilizer">Stablilisator</string>
+    <string name="clicker">Klicker</string>
+    <string name="arrow_number_x">Pil nummer %s</string>
+    <string name="training_with_standard_round">Träning med standard runda</string>
+    <string name="free_training">Fri träning</string>
+    <string name="competition">Tävlande</string>
+    <string name="about">Om</string>
+    <string name="general">Allnänt</string>
+    <string name="contribute">Bidra</string>
+    <string name="connect">Anslut</string>
+    <string name="special_thanks_to">Speciellt tack till</string>
+    <string name="all_translators">Alla killar, som hjälpte till med att översätta app!</string>
+    <string name="all_beta_testers">Alla som anslutit sig till betatestar gruppen och därför hjälper till att kontinuerligt förbättra appen.</string>
+    <string name="test_beta">Testa den senaste betaversionen</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Dela med dina vänner</string>
+    <string name="donate">Donera</string>
+    <string name="donate_via_paypal">Donera via PayPal</string>
+    <string name="translate_crowdin">Översätta på Crowdin</string>
+    <string name="network_linkedin">Nätverk på LinkedIn</string>
+    <string name="search">Sök</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Hela träningen</string>
+    <string name="show_shots_round">Nuvarande runda</string>
+    <string name="show_shots_end">Nuvarande omgång</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Födelsedag</string>
+    <string name="first_name">Förnamn</string>
+    <string name="last_name">Efternamn</string>
+    <string name="age">Ålder</string>
+    <string name="show_signature">Signatur</string>
+    <string name="archer">Bågskytt</string>
+    <string name="hits">Träffar</string>
+    <string name="misses">Missar</string>
+    <string name="new_end">Ny omgång</string>
+    <string name="distribution">Fördelning</string>
+    <string name="count">Antal</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Måltavlans zoom-nivå</string>
+    <string name="action_pdf">Exportera som PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Tidsstämpel</string>
+    <string name="change_target_face">Ändra måltavla</string>
+    <string name="your_first_training">Din första träning</string>
+    <string name="grouping">Gruppering</string>
+    <string name="show_clusters">Kluster</string>
+    <string name="first_training_description">Tryck på plusset för att starta en ny träning.</string>
+    <string name="show_average">Snitt</string>
+    <string name="show_none">Ingen</string>
+    <string name="left_handed">Vänsterhänt</string>
+    <string name="right_handed">Högerhänt</string>
+    <string name="keyboard">Tangentbord</string>
+    <string name="backup_drive_desc">Genom att säkerhetskopiera din data kan du återställa alla dina träningar om du skulle förlora dem eller byta telefon.</string>
+    <string name="backup_now">Säkerhetskopiera nu</string>
+    <string name="last_backup">Senaste säkerhetskopieringen: %s</string>
+    <string name="recent_backups">Senaste säkerhetskopiorna</string>
+    <string name="dialog_restore_title">Återställ till föregående version</string>
+    <string name="restore_desc">Genom att återställa datan kommer all befintlig data skrivas över med säkerhetskopian.</string>
+    <string name="backup_details">Backupdetaljer</string>
+    <string name="restore">Återställ</string>
+    <string name="backup_location">Säkerhetskopieringsplats</string>
+    <string name="internal_storage">Intern lagring</string>
+    <string name="automatic_backup">Automatisk säkerhetskopiering</string>
+    <string name="restoring">Återställer säkerhetskopia…</string>
+    <string name="restore_failed">Återställning misslyckades</string>
+    <string name="delete_failed">Borttagning misslyckades</string>
+    <string name="backup_restore_desc">Säkerhetskopiera och återställ appdata</string>
+    <string name="exporting">Exporterar…</string>
+    <string name="loading_backups_failed">Laddning av säkerhetskopior misslyckades!</string>
+    <string name="external_storage">Extern lagring</string>
+    <string name="backup_interval">Säkerhetskopieringsintervall</string>
+    <string name="daily">Daglig</string>
+    <string name="weekly">Veckovis</string>
+    <string name="monthly">Månadsvis</string>
+    <string name="connection_failed">Anslutning misslyckades!</string>
+    <string name="shooting_indoor">Skjuter innomhus</string>
+    <string name="bow_rest_vertical_position">Vertikal position</string>
+    <string name="bow_rest">Pilhylla</string>
+    <string name="bow_rest_horizontal_position">Horisontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nockläge</string>
+    <string name="bow_string">Sträng</string>
+    <string name="bow_scope_magnification">Siktets förstoring</string>
+    <string name="bow_rest_stiffness">Styvhet</string>
+    <string name="bow_button">Knapp</string>
+    <string name="more_fields">Fler fält</string>
+    <string name="recently_used">Nyligen använda</string>
+    <string name="intro_title_track_training_progress">Glöm poängkort av papper!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Språk</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Öppna panel</string>
+    <string name="drawer_close">Stäng panel</string>
+    <string name="help">Hjälp</string>
+    <string name="home">Start</string>
+    <string name="click_to_enter_profile">Klicka för att ange profilinformation</string>
+    <string name="no_trainings">Du har inga träningar ännu!</string>
+    <string name="no_bows">Inga bågar</string>
+    <string name="no_arrows">Inga pilar</string>
+    <string name="version_info">Versionsinfo</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Max antal pilar</string>
+    <string name="distances">Avstånd</string>
+    <string name="diameters">Diameter</string>
+    <string name="bows">Bågar</string>
+    <string name="reset">Återställ</string>
+    <string name="end_x_of_y">Serie %1$d/%2$d</string>
+    <string name="round_x_of_y">Runda %1$d/%2$d</string>
+    <string name="settings_summary_timer">Justera tidtagarens beteende</string>
+    <string name="settings_summary_scoreboard">Ändra resultattavlans utseende</string>
+    <string name="settings_summary_input">Anpassa inmatnings skärmen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Skriv in personlig information</string>
+    <string name="licence_number">Licensnivå</string>
+    <string name="file_type">Filtyp</string>
+    <string name="clear">Rensa</string>
+    <string name="tap_to_sign">Tryck för att signera</string>
+    <string name="pdf_file">PDF-fil</string>
+    <string name="image_file">Bildfil</string>
+    <string name="settings_summary_statistics">Justera statistikskärmen</string>
+    <string name="settings_statistics_spots_to_single_target">Sammanfoga spottar till en tavla</string>
+    <string name="keep_above_lockscreen">Håll ovanför låsskärm</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Behörighet krävs</string>
+    <string name="backup_permission_explanation"><![CDATA[För att kunna göra en säkerhetskopiering av din data så behöver appen behörighet för att komma åt den interna lagringen hos din telefon. För att använda säkerhetskopierings-funktionen, gå till systeminställningar > Appar > MyTargets > behörigheter och aktivera "lagring".]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8aeede605..fbd312d5c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -15,355 +15,356 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Ayarlar</string>
-  <string name="settings">Ayarlar</string>
-  <string name="prev">Geri</string>
-  <string name="next">Ileri</string>
-  <string name="save">Kaydet</string>
-  <string name="custom">Özel</string>
-  <string name="training">Antreman</string>
-  <string name="bow">yay</string>
-  <string name="arrow">Ok</string>
-  <string name="round">Tur</string>
-  <string name="points">Puanlar</string>
-  <string name="passe">Bitiş</string>
-  <!-- Overview -->
-  <string name="new_training">Yeni antreman</string>
-  <string name="new_bow">Yeni yay</string>
-  <string name="new_arrow">Yeni ok</string>
-  <string name="new_round">Yeni tur</string>
-  <plurals name="training_selected">
-    <item quantity="one">Bir antrenman seçildi</item>
-    <item quantity="other">%d antrenman seçildi</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">Bir yay seçildi</item>
-    <item quantity="other">%d yay seçildi</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">Bir ok seçildi</item>
-    <item quantity="other">%d ok seçildi</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">Bir seri seçildi</item>
-    <item quantity="other">%d seri seçildi</item>
-  </plurals>
-  <string name="edit">Düzenle</string>
-  <string name="delete">Sil</string>
-  <string name="statistic">Istatistik</string>
-  <!-- Share -->
-  <string name="share">Paylaş</string>
-  <string name="dispersion_pattern">Dağılım şekli</string>
-  <string name="sharing_failed">Paylaşım başarısız oldu!</string>
-  <!-- Export -->
-  <string name="send_exported">Aktarılan verileri gönder</string>
-  <string name="exporting_failed">Dışa aktarma başarısız oldu!</string>
-  <!-- New bow -->
-  <string name="add_bow">Yay ekle</string>
-  <string name="name">Ad</string>
-  <string name="bow_type">Yay tipi</string>
-  <string name="properties">Özellikler</string>
-  <string name="brand">Marka</string>
-  <string name="size">Ebat</string>
-  <string name="description">Tanımlama</string>
-  <string name="height">Kiriş yüksekliği</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Nişangah ayarları</string>
-  <string name="add">Ekle</string>
-  <string name="take_picture">Fotoğraf Çek</string>
-  <string name="pick_from_gallery">Galeri\'den bir görüntü seçin</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Ok Ekle</string>
-  <string name="length">Uzunluk</string>
-  <string name="spine">Sapma</string>
-  <string name="weight">Ağırlık</string>
-  <string name="vanes">Tüy</string>
-  <string name="nock">Arkalık</string>
-  <string name="material">Malzeme</string>
-  <!-- New round -->
-  <string name="title">Başlık</string>
-  <string name="outdoor">Açık Alan</string>
-  <string name="indoor">Salon</string>
-  <string name="distance">Mesafe</string>
-  <string name="format">Düzen</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">1 seri</item>
-    <item quantity="other">%d seri</item>
-  </plurals>
-  <string name="with">nın</string>
-  <plurals name="arrow">
-    <item quantity="one">bir ok</item>
-    <item quantity="other">%d ok</item>
-  </plurals>
-  <string name="target_face">Hedef Yüzü</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Puan tablosu</string>
-  <string name="arrows">Oklar</string>
-  <string name="sum">Toplam</string>
-  <string name="carry">Ara toplam</string>
-  <string name="action_print">Yazdır</string>
-  <string name="average">Ortalama</string>
-  <!-- Input mode -->
-  <string name="comment">Yorum</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Dosya seç</string>
-  <string name="dir_not_created">Dizin oluşturulamadı!</string>
-  <string name="import_failed">Aktarma başarısız!</string>
-  <string name="file_not_found">Dosya bulunamadı!</string>
-  <string name="failed_reading_file">Dosya okuma başarısız!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Desteğiniz için teşekkürler!</string>
-  <string name="donate_text" formatted="false">Ücretler vergi ve %30 Google giderleridir. Alternatif olarak PayPal üzerinden  dreier.florian@gmail.com hesabına bağışta bulunabilirsiniz.</string>
-  <!-- Timer -->
-  <string name="timer">kronometre</string>
-  <string name="touch_to_start">Başlat</string>
-  <string name="preparation">Hazırlan</string>
-  <string name="shooting">Atış</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Atış Süresi</string>
-  <string name="timer_waiting_time">Hazırlık süresi</string>
-  <string name="timer_warning_time">Uyarı Süresi</string>
-  <string name="timer_sound">Ses</string>
-  <string name="timer_vibrate">Titreşim</string>
-  <!-- Settings -->
-  <string name="backup_action">Yedekle</string>
-  <string name="import_action">Içe aktarma</string>
-  <string name="exports_as_csv">Csv dosyası olarak aktar</string>
-  <string name="licences">Açık kaynak lisansları</string>
-  <string name="licences_summary">Lisanslar için yasal notlar</string>
-  <string name="version">Sürüm %s</string>
-  <plurals name="second">
-    <item quantity="one">%d saniye</item>
-    <item quantity="other">%d saniye</item>
-  </plurals>
-  <string name="info">Bilgi</string>
-  <string name="data">Veri</string>
-  <string name="weather">Hava durumu</string>
-  <string name="environment">Ortam</string>
-  <string name="wind_speed">Rüzgar hızı</string>
-  <string name="wind_direction">Rüzgar yönü</string>
-  <string name="sight_setting_removed">Nişangah ayarı silindi!</string>
-  <string name="metric">Metrik</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Geri Al</string>
-  <string name="standard_rounds">Standart tur</string>
-  <string name="expand_collapse">Genişlet/Daralt</string>
-  <string name="new_round_template">Yeni şablon</string>
-  <string name="arrow_numbers">Ok numaraları</string>
-  <string name="round_removed">Tur silindi!</string>
-  <string name="custom_round">Özel Tur</string>
-  <string name="filter">Filtrele</string>
-  <string name="club">Kulüp</string>
-  <string name="target">Hedef</string>
-  <string name="standard_round">Standart tur</string>
-  <string name="use_as_template">Şablon olarak kullan?</string>
-  <string name="create_copy">Bu standart bir turdur. Düzenlemek üzere kopyasını kaydetmek ister misin \n?</string>
-  <string name="practice">İdman</string>
-  <string name="edit_training">Antrenmanı Düzenle</string>
-  <string name="edit_standard_round">Standart turu düzenle</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">Bir Ok Silindi</item>
-    <item quantity="other">%d Ok Silindi</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">Bir ok silindi</item>
-    <item quantity="other">%d ok silindi</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">Bir antrenman silindi</item>
-    <item quantity="other">%d antrenman silindi</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">Bir tur silindi</item>
-    <item quantity="other">%d tur silindi</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Tur %d</item>
-    <item quantity="other">Tur %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">%d tur seçildi</item>
-    <item quantity="other">%d tur seçildi</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">%d tur silindi</item>
-    <item quantity="other">%d tur silindi</item>
-  </plurals>
-  <string name="date">Tarih</string>
-  <string name="edit_round">Turu düzenle</string>
-  <string name="draw_weight">Çekiş ağırlığı</string>
-  <string name="sight">Nişangâh</string>
-  <string name="limbs">Kanatlar</string>
-  <string name="my_bow">Yayım</string>
-  <string name="my_arrow">Okum</string>
-  <string name="tip_weight">Uç ağırlığı</string>
-  <string name="arrow_ranking">Ok sıralaması</string>
-  <string name="arrow_x_of_set_of_arrows">%1$s oktan %2$s</string>
-  <string name="display">Göster</string>
-  <string name="print">Yazdır</string>
-  <string name="table">Tablo</string>
-  <string name="comments">Yorumlar</string>
-  <string name="show_points_colored">Boyanmış noktaları göster</string>
-  <string name="stabilizer">Stabilizatör</string>
-  <string name="clicker">Kliker</string>
-  <string name="arrow_number_x">Ok numarası %s</string>
-  <string name="training_with_standard_round">Standart hedefle antrenman</string>
-  <string name="free_training">Serbest Antrenman</string>
-  <string name="competition">Yarışma</string>
-  <string name="about">Hakkında</string>
-  <string name="general">Genel</string>
-  <string name="contribute">Katkıda bulunan</string>
-  <string name="connect">Bağlan</string>
-  <string name="special_thanks_to">Özel teşekkürler</string>
-  <string name="all_translators">Uygulamayı çevirmeye yardımcı olan herkes!</string>
-  <string name="all_beta_testers">Beta test kullanıcıları grubuna katılan herkes uygulamanın sürekli iyileştirilmesine yardımcı olur.</string>
-  <string name="test_beta">En son beta sürümü test et</string>
-  <string name="join_on_google_plus">Google+ üzerinde bize katılın</string>
-  <string name="share_with_friends">Arkadaşlarınla paylaş</string>
-  <string name="donate">Bağış yapın</string>
-  <string name="donate_via_paypal">PayPal ile bağış yap</string>
-  <string name="translate_crowdin">Crowdin\'de çeviri yap</string>
-  <string name="network_linkedin">LinkedIn\'deki Ağ</string>
-  <string name="search">Ara</string>
-  <string name="us">ABD</string>
-  <string name="show_shots_training">Bütün eğitim</string>
-  <string name="show_shots_round">Şuanki tur</string>
-  <string name="show_shots_end">Geçerli bitiş</string>
-  <string name="profile">Profil</string>
-  <string name="birthday">Doğum günü</string>
-  <string name="first_name">Ad</string>
-  <string name="last_name">Soy ad</string>
-  <string name="age">Yaş</string>
-  <string name="show_signature">Imza</string>
-  <string name="archer">Okçu</string>
-  <string name="hits">Vuruşlar</string>
-  <string name="misses">Kaçanlar</string>
-  <string name="new_end">Yeni son</string>
-  <string name="distribution">Dağıtım</string>
-  <string name="count">Sayı</string>
-  <string name="diameter">Çap</string>
-  <string name="input">Giriş</string>
-  <string name="target_zoom">Hedef yakınlaştırma seviyesi</string>
-  <string name="action_pdf">PDF olarak dışa aktar</string>
-  <string name="arrow_diameter_scale">Ok çapı ölçeği</string>
-  <string name="timestamp">Zaman Damgası</string>
-  <string name="change_target_face">Hedef yüzü değiştir</string>
-  <string name="your_first_training">İlk eğitiminiz</string>
-  <string name="grouping">Gruplama</string>
-  <string name="show_clusters">Küme</string>
-  <string name="first_training_description">Yeni bir eğitim başlatmak için artıya dokunun.</string>
-  <string name="show_average">Ortalama</string>
-  <string name="show_none">Hiç biri</string>
-  <string name="left_handed">Solak</string>
-  <string name="right_handed">Sağlak</string>
-  <string name="keyboard">Klavye</string>
-  <string name="backup_drive_desc">Verilerinizi yedeklemek, telefonunuzu kaybettiğinizde veya değiştirdiğinizde tüm eğitimlerinizi geri yüklemenizi sağlar.</string>
-  <string name="backup_now">Şimdi yedekle</string>
-  <string name="last_backup">Son yedekleme: %s</string>
-  <string name="recent_backups">Son yedeklemeler</string>
-  <string name="dialog_restore_title">Önceki sürüme geri çevir</string>
-  <string name="restore_desc">Verilerin geri yüklenmesi, var olan tüm verilerin yedekleme ile üzerine yazacaktır.</string>
-  <string name="backup_details">Yedekleme ayrıntıları</string>
-  <string name="restore">Geri yükle</string>
-  <string name="backup_location">Yedekleme konumu</string>
-  <string name="internal_storage">Dahili depolama birimi</string>
-  <string name="automatic_backup">Otomatik yedekleme</string>
-  <string name="restoring">Yedek geri yükleniyor…</string>
-  <string name="restore_failed">Geri yüklenemedi</string>
-  <string name="delete_failed">Silme işlemi başarısız oldu</string>
-  <string name="backup_restore_desc">Uygulama verilerini yedekleme ve geri yükleme</string>
-  <string name="exporting">Dışar aktarılıyor…</string>
-  <string name="loading_backups_failed">Yedekler yüklenemedi!</string>
-  <string name="external_storage">Harici depolama</string>
-  <string name="backup_interval">Yedekleme aralığı</string>
-  <string name="daily">Günlük</string>
-  <string name="weekly">Haftalık</string>
-  <string name="monthly">Aylık</string>
-  <string name="connection_failed">Bağlantı başarısız oldu!</string>
-  <string name="shooting_indoor">Kapalı alanda çekim yapmak</string>
-  <string name="bow_rest_vertical_position">Dikey pozisyon</string>
-  <string name="bow_rest">Dinlenme</string>
-  <string name="bow_rest_horizontal_position">Yatay pozisyon</string>
-  <string name="bow_cam_settings">Kam ayarları</string>
-  <string name="bow_letoff_weight">Ağırlıktan çıkar</string>
-  <string name="bow_nocking_point">Bağlantı noktası</string>
-  <string name="bow_string">Dizi</string>
-  <string name="bow_scope_magnification">Kapsam büyütme</string>
-  <string name="bow_rest_stiffness">Sertlik</string>
-  <string name="bow_button">Buton</string>
-  <string name="more_fields">Daha fazla alan</string>
-  <string name="recently_used">Son zamanlarda kullanılmış</string>
-  <string name="intro_title_track_training_progress">Kağıt kâğıtlarını unutun!</string>
-  <string name="intro_description_track_training_progress">Tam ok çizimi ile, eğitim verilerinizden daha yararlı bilgiler elde edebilirsiniz \.</string>
-  <string name="intro_title_everything_in_one_place">İhtiyacınız olan her şey \ tek bir yerde</string>
-  <string name="intro_description_everything_in_one_place">Yay, ok ve nişan kontrolü, \ narchery zamanlayıcı, istatistik ve dahası çok daha fazlası…</string>
-  <string name="average_arrow_score_per_end">Her bitişte ortalama ok puanı</string>
-  <string name="show_end">Sonunu göster</string>
-  <string name="show_round">Turu göster</string>
-  <string name="show_training">Eğtimi göster</string>
-  <string name="summary">Özet</string>
-  <string name="end">Son</string>
-  <string name="average_of">Ortalama</string>
-  <string name="displayed_shots">Görüntülenen çekimler</string>
-  <string name="invalid_decimal_number">Geçersiz ondalık sayı</string>
-  <string name="not_within_expected_range_mm">Beklenen 1 ila 20 mm aralığında değil</string>
-  <string name="not_within_expected_range_inch">Beklenen 0 ila 1 inç aralığı içinde değil</string>
-  <string name="next_round">Sonraki tur</string>
-  <string name="previous_round">Önceki tur</string>
-  <string name="overview">Genel bakış</string>
-  <string name="score">Skor</string>
-  <string name="show_reached_score">Ulaşılan skoru göster</string>
-  <string name="show_total_score">Toplam skoru göster</string>
-  <string name="show_percentage">Yüzdeleri göster</string>
-  <string name="show_arrow_average">Ok ortalamasını göster</string>
-  <string name="image_deleted">Resim silindi</string>
-  <string name="delete_image">Resim silinsin mi?</string>
-  <string name="keyboard_type">Klavye türü</string>
-  <string name="keyboard_enabled">Etkin klavye</string>
-  <string name="sort_shots">Sıralama çekim</string>
-  <string name="sort_shots_for_spots">Sıralama çekim nokta hedef yüzleri</string>
-  <string name="target_captain">Hedef Kaptan</string>
-  <string name="language">Dil</string>
-  <string name="warning_backup_experimental">Uyarı: Bu özellik hala deneysel! Yedekleme gerçekten başarılı olsaydı lütfen düzenli aralıklarla kontrol edin!</string>
-  <string name="drawer_open">Çizim aç</string>
-  <string name="drawer_close">Çekmeceyi kapat</string>
-  <string name="help">Yardım</string>
-  <string name="home">Ev</string>
-  <string name="click_to_enter_profile">Daha fazla bilgi almak için tıklayın</string>
-  <string name="no_trainings">Hiçbir eğitimin yok, henüz!</string>
-  <string name="no_bows">Yay yok</string>
-  <string name="no_arrows">Ok yok</string>
-  <string name="version_info">Sürüm bilgisi</string>
-  <string name="version_prefix">Sürüm</string>
-  <string name="max_arrow_number">En fazla ok sayısı</string>
-  <string name="distances">Mesafe</string>
-  <string name="diameters">Çap</string>
-  <string name="bows">Yaylar</string>
-  <string name="reset">Sıfırla</string>
-  <string name="end_x_of_y">Bitiş %1$d/%2$d</string>
-  <string name="round_x_of_y">Tur %1$d/%2$d</string>
-  <string name="settings_summary_timer">Okçuluk zamanlayıcısının davranışını ayarlayın</string>
-  <string name="settings_summary_scoreboard">Skorbord görünümünü değiştir</string>
-  <string name="settings_summary_input">Giriş ekranını özelleştirme</string>
-  <string name="settings_summary_overview">Eğitimler, yuvarlaklıklar ve bitenler için gösterilen bilgileri kişiselleştirin</string>
-  <string name="settings_summary_profile">Kişisel bilgileri girin</string>
-  <string name="licence_number">Lisans numarası</string>
-  <string name="file_type">Dosya tipi</string>
-  <string name="clear">Açık</string>
-  <string name="tap_to_sign">İmzalamak için dokunun</string>
-  <string name="pdf_file">PDF dosyası</string>
-  <string name="image_file">Görüntü dosyası</string>
-  <string name="settings_summary_statistics">İstatistik ekranını ayarla</string>
-  <string name="settings_statistics_spots_to_single_target">Noktaları tek hedefe topla</string>
-  <string name="keep_above_lockscreen">Kilit ekranın üstünde tutun</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Ayarlar</string>
+    <string name="settings">Ayarlar</string>
+    <string name="prev">Geri</string>
+    <string name="next">Ileri</string>
+    <string name="save">Kaydet</string>
+    <string name="custom">Özel</string>
+    <string name="training">Antreman</string>
+    <string name="bow">yay</string>
+    <string name="arrow">Ok</string>
+    <string name="round">Tur</string>
+    <string name="points">Puanlar</string>
+    <string name="passe">Bitiş</string>
+    <!-- Overview -->
+    <string name="new_training">Yeni antreman</string>
+    <string name="new_bow">Yeni yay</string>
+    <string name="new_arrow">Yeni ok</string>
+    <string name="new_round">Yeni tur</string>
+    <plurals name="training_selected">
+        <item quantity="one">Bir antrenman seçildi</item>
+        <item quantity="other">%d antrenman seçildi</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">Bir yay seçildi</item>
+        <item quantity="other">%d yay seçildi</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">Bir ok seçildi</item>
+        <item quantity="other">%d ok seçildi</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">Bir seri seçildi</item>
+        <item quantity="other">%d seri seçildi</item>
+    </plurals>
+    <string name="edit">Düzenle</string>
+    <string name="delete">Sil</string>
+    <string name="statistic">Istatistik</string>
+    <!-- Share -->
+    <string name="share">Paylaş</string>
+    <string name="dispersion_pattern">Dağılım şekli</string>
+    <string name="sharing_failed">Paylaşım başarısız oldu!</string>
+    <!-- Export -->
+    <string name="send_exported">Aktarılan verileri gönder</string>
+    <string name="exporting_failed">Dışa aktarma başarısız oldu!</string>
+    <!-- New bow -->
+    <string name="add_bow">Yay ekle</string>
+    <string name="name">Ad</string>
+    <string name="bow_type">Yay tipi</string>
+    <string name="properties">Özellikler</string>
+    <string name="brand">Marka</string>
+    <string name="size">Ebat</string>
+    <string name="description">Tanımlama</string>
+    <string name="height">Kiriş yüksekliği</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Nişangah ayarları</string>
+    <string name="add">Ekle</string>
+    <string name="take_picture">Fotoğraf Çek</string>
+    <string name="pick_from_gallery">Galeri\'den bir görüntü seçin</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Ok Ekle</string>
+    <string name="length">Uzunluk</string>
+    <string name="spine">Sapma</string>
+    <string name="weight">Ağırlık</string>
+    <string name="vanes">Tüy</string>
+    <string name="nock">Arkalık</string>
+    <string name="material">Malzeme</string>
+    <!-- New round -->
+    <string name="title">Başlık</string>
+    <string name="outdoor">Açık Alan</string>
+    <string name="indoor">Salon</string>
+    <string name="distance">Mesafe</string>
+    <string name="format">Düzen</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">1 seri</item>
+        <item quantity="other">%d seri</item>
+    </plurals>
+    <string name="with">nın</string>
+    <plurals name="arrow">
+        <item quantity="one">bir ok</item>
+        <item quantity="other">%d ok</item>
+    </plurals>
+    <string name="target_face">Hedef Yüzü</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Puan tablosu</string>
+    <string name="arrows">Oklar</string>
+    <string name="sum">Toplam</string>
+    <string name="carry">Ara toplam</string>
+    <string name="action_print">Yazdır</string>
+    <string name="average">Ortalama</string>
+    <!-- Input mode -->
+    <string name="comment">Yorum</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Dosya seç</string>
+    <string name="dir_not_created">Dizin oluşturulamadı!</string>
+    <string name="import_failed">Aktarma başarısız!</string>
+    <string name="file_not_found">Dosya bulunamadı!</string>
+    <string name="failed_reading_file">Dosya okuma başarısız!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Desteğiniz için teşekkürler!</string>
+    <string name="donate_text" formatted="false">Ücretler vergi ve %30 Google giderleridir. Alternatif olarak PayPal üzerinden  dreier.florian@gmail.com hesabına bağışta bulunabilirsiniz.</string>
+    <!-- Timer -->
+    <string name="timer">kronometre</string>
+    <string name="touch_to_start">Başlat</string>
+    <string name="preparation">Hazırlan</string>
+    <string name="shooting">Atış</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Atış Süresi</string>
+    <string name="timer_waiting_time">Hazırlık süresi</string>
+    <string name="timer_warning_time">Uyarı Süresi</string>
+    <string name="timer_sound">Ses</string>
+    <string name="timer_vibrate">Titreşim</string>
+    <!-- Settings -->
+    <string name="backup_action">Yedekle</string>
+    <string name="import_action">Içe aktarma</string>
+    <string name="exports_as_csv">Csv dosyası olarak aktar</string>
+    <string name="licences">Açık kaynak lisansları</string>
+    <string name="licences_summary">Lisanslar için yasal notlar</string>
+    <string name="version">Sürüm %s</string>
+    <plurals name="second">
+        <item quantity="one">%d saniye</item>
+        <item quantity="other">%d saniye</item>
+    </plurals>
+    <string name="info">Bilgi</string>
+    <string name="data">Veri</string>
+    <string name="weather">Hava durumu</string>
+    <string name="environment">Ortam</string>
+    <string name="wind_speed">Rüzgar hızı</string>
+    <string name="wind_direction">Rüzgar yönü</string>
+    <string name="sight_setting_removed">Nişangah ayarı silindi!</string>
+    <string name="metric">Metrik</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Geri Al</string>
+    <string name="standard_rounds">Standart tur</string>
+    <string name="expand_collapse">Genişlet/Daralt</string>
+    <string name="new_round_template">Yeni şablon</string>
+    <string name="arrow_numbers">Ok numaraları</string>
+    <string name="round_removed">Tur silindi!</string>
+    <string name="custom_round">Özel Tur</string>
+    <string name="filter">Filtrele</string>
+    <string name="club">Kulüp</string>
+    <string name="target">Hedef</string>
+    <string name="standard_round">Standart tur</string>
+    <string name="use_as_template">Şablon olarak kullan?</string>
+    <string name="create_copy">Bu standart bir turdur. Düzenlemek üzere kopyasını kaydetmek ister misin \n?</string>
+    <string name="practice">İdman</string>
+    <string name="edit_training">Antrenmanı Düzenle</string>
+    <string name="edit_standard_round">Standart turu düzenle</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">Bir Ok Silindi</item>
+        <item quantity="other">%d Ok Silindi</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">Bir ok silindi</item>
+        <item quantity="other">%d ok silindi</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">Bir antrenman silindi</item>
+        <item quantity="other">%d antrenman silindi</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">Bir tur silindi</item>
+        <item quantity="other">%d tur silindi</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Tur %d</item>
+        <item quantity="other">Tur %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">%d tur seçildi</item>
+        <item quantity="other">%d tur seçildi</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">%d tur silindi</item>
+        <item quantity="other">%d tur silindi</item>
+    </plurals>
+    <string name="date">Tarih</string>
+    <string name="edit_round">Turu düzenle</string>
+    <string name="draw_weight">Çekiş ağırlığı</string>
+    <string name="sight">Nişangâh</string>
+    <string name="limbs">Kanatlar</string>
+    <string name="my_bow">Yayım</string>
+    <string name="my_arrow">Okum</string>
+    <string name="tip_weight">Uç ağırlığı</string>
+    <string name="arrow_ranking">Ok sıralaması</string>
+    <string name="arrow_x_of_set_of_arrows">%1$s oktan %2$s</string>
+    <string name="display">Göster</string>
+    <string name="print">Yazdır</string>
+    <string name="table">Tablo</string>
+    <string name="comments">Yorumlar</string>
+    <string name="show_points_colored">Boyanmış noktaları göster</string>
+    <string name="stabilizer">Stabilizatör</string>
+    <string name="clicker">Kliker</string>
+    <string name="arrow_number_x">Ok numarası %s</string>
+    <string name="training_with_standard_round">Standart hedefle antrenman</string>
+    <string name="free_training">Serbest Antrenman</string>
+    <string name="competition">Yarışma</string>
+    <string name="about">Hakkında</string>
+    <string name="general">Genel</string>
+    <string name="contribute">Katkıda bulunan</string>
+    <string name="connect">Bağlan</string>
+    <string name="special_thanks_to">Özel teşekkürler</string>
+    <string name="all_translators">Uygulamayı çevirmeye yardımcı olan herkes!</string>
+    <string name="all_beta_testers">Beta test kullanıcıları grubuna katılan herkes uygulamanın sürekli iyileştirilmesine yardımcı olur.</string>
+    <string name="test_beta">En son beta sürümü test et</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Arkadaşlarınla paylaş</string>
+    <string name="donate">Bağış yapın</string>
+    <string name="donate_via_paypal">PayPal ile bağış yap</string>
+    <string name="translate_crowdin">Crowdin\'de çeviri yap</string>
+    <string name="network_linkedin">LinkedIn\'deki Ağ</string>
+    <string name="search">Ara</string>
+    <string name="us">ABD</string>
+    <string name="show_shots_training">Bütün eğitim</string>
+    <string name="show_shots_round">Şuanki tur</string>
+    <string name="show_shots_end">Geçerli bitiş</string>
+    <string name="profile">Profil</string>
+    <string name="birthday">Doğum günü</string>
+    <string name="first_name">Ad</string>
+    <string name="last_name">Soy ad</string>
+    <string name="age">Yaş</string>
+    <string name="show_signature">Imza</string>
+    <string name="archer">Okçu</string>
+    <string name="hits">Vuruşlar</string>
+    <string name="misses">Kaçanlar</string>
+    <string name="new_end">Yeni son</string>
+    <string name="distribution">Dağıtım</string>
+    <string name="count">Sayı</string>
+    <string name="diameter">Çap</string>
+    <string name="input">Giriş</string>
+    <string name="target_zoom">Hedef yakınlaştırma seviyesi</string>
+    <string name="action_pdf">PDF olarak dışa aktar</string>
+    <string name="arrow_diameter_scale">Ok çapı ölçeği</string>
+    <string name="timestamp">Zaman Damgası</string>
+    <string name="change_target_face">Hedef yüzü değiştir</string>
+    <string name="your_first_training">İlk eğitiminiz</string>
+    <string name="grouping">Gruplama</string>
+    <string name="show_clusters">Küme</string>
+    <string name="first_training_description">Yeni bir eğitim başlatmak için artıya dokunun.</string>
+    <string name="show_average">Ortalama</string>
+    <string name="show_none">Hiç biri</string>
+    <string name="left_handed">Solak</string>
+    <string name="right_handed">Sağlak</string>
+    <string name="keyboard">Klavye</string>
+    <string name="backup_drive_desc">Verilerinizi yedeklemek, telefonunuzu kaybettiğinizde veya değiştirdiğinizde tüm eğitimlerinizi geri yüklemenizi sağlar.</string>
+    <string name="backup_now">Şimdi yedekle</string>
+    <string name="last_backup">Son yedekleme: %s</string>
+    <string name="recent_backups">Son yedeklemeler</string>
+    <string name="dialog_restore_title">Önceki sürüme geri çevir</string>
+    <string name="restore_desc">Verilerin geri yüklenmesi, var olan tüm verilerin yedekleme ile üzerine yazacaktır.</string>
+    <string name="backup_details">Yedekleme ayrıntıları</string>
+    <string name="restore">Geri yükle</string>
+    <string name="backup_location">Yedekleme konumu</string>
+    <string name="internal_storage">Dahili depolama birimi</string>
+    <string name="automatic_backup">Otomatik yedekleme</string>
+    <string name="restoring">Yedek geri yükleniyor…</string>
+    <string name="restore_failed">Geri yüklenemedi</string>
+    <string name="delete_failed">Silme işlemi başarısız oldu</string>
+    <string name="backup_restore_desc">Uygulama verilerini yedekleme ve geri yükleme</string>
+    <string name="exporting">Dışar aktarılıyor…</string>
+    <string name="loading_backups_failed">Yedekler yüklenemedi!</string>
+    <string name="external_storage">Harici depolama</string>
+    <string name="backup_interval">Yedekleme aralığı</string>
+    <string name="daily">Günlük</string>
+    <string name="weekly">Haftalık</string>
+    <string name="monthly">Aylık</string>
+    <string name="connection_failed">Bağlantı başarısız oldu!</string>
+    <string name="shooting_indoor">Kapalı alanda çekim yapmak</string>
+    <string name="bow_rest_vertical_position">Dikey pozisyon</string>
+    <string name="bow_rest">Dinlenme</string>
+    <string name="bow_rest_horizontal_position">Yatay pozisyon</string>
+    <string name="bow_cam_settings">Kam ayarları</string>
+    <string name="bow_letoff_weight">Ağırlıktan çıkar</string>
+    <string name="bow_nocking_point">Bağlantı noktası</string>
+    <string name="bow_string">Dizi</string>
+    <string name="bow_scope_magnification">Kapsam büyütme</string>
+    <string name="bow_rest_stiffness">Sertlik</string>
+    <string name="bow_button">Buton</string>
+    <string name="more_fields">Daha fazla alan</string>
+    <string name="recently_used">Son zamanlarda kullanılmış</string>
+    <string name="intro_title_track_training_progress">Kağıt kâğıtlarını unutun!</string>
+    <string name="intro_description_track_training_progress">Tam ok çizimi ile, eğitim verilerinizden daha yararlı bilgiler elde edebilirsiniz \.</string>
+    <string name="intro_title_everything_in_one_place">İhtiyacınız olan her şey \ tek bir yerde</string>
+    <string name="intro_description_everything_in_one_place">Yay, ok ve nişan kontrolü, \ narchery zamanlayıcı, istatistik ve dahası çok daha fazlası…</string>
+    <string name="average_arrow_score_per_end">Her bitişte ortalama ok puanı</string>
+    <string name="show_end">Sonunu göster</string>
+    <string name="show_round">Turu göster</string>
+    <string name="show_training">Eğtimi göster</string>
+    <string name="summary">Özet</string>
+    <string name="end">Son</string>
+    <string name="average_of">Ortalama</string>
+    <string name="displayed_shots">Görüntülenen çekimler</string>
+    <string name="invalid_decimal_number">Geçersiz ondalık sayı</string>
+    <string name="not_within_expected_range_mm">Beklenen 1 ila 20 mm aralığında değil</string>
+    <string name="not_within_expected_range_inch">Beklenen 0 ila 1 inç aralığı içinde değil</string>
+    <string name="next_round">Sonraki tur</string>
+    <string name="previous_round">Önceki tur</string>
+    <string name="overview">Genel bakış</string>
+    <string name="score">Skor</string>
+    <string name="show_reached_score">Ulaşılan skoru göster</string>
+    <string name="show_total_score">Toplam skoru göster</string>
+    <string name="show_percentage">Yüzdeleri göster</string>
+    <string name="show_arrow_average">Ok ortalamasını göster</string>
+    <string name="image_deleted">Resim silindi</string>
+    <string name="delete_image">Resim silinsin mi?</string>
+    <string name="keyboard_type">Klavye türü</string>
+    <string name="keyboard_enabled">Etkin klavye</string>
+    <string name="sort_shots">Sıralama çekim</string>
+    <string name="sort_shots_for_spots">Sıralama çekim nokta hedef yüzleri</string>
+    <string name="target_captain">Hedef Kaptan</string>
+    <string name="language">Dil</string>
+    <string name="warning_backup_experimental">Uyarı: Bu özellik hala deneysel! Yedekleme gerçekten başarılı olsaydı lütfen düzenli aralıklarla kontrol edin!</string>
+    <string name="drawer_open">Çizim aç</string>
+    <string name="drawer_close">Çekmeceyi kapat</string>
+    <string name="help">Yardım</string>
+    <string name="home">Ev</string>
+    <string name="click_to_enter_profile">Daha fazla bilgi almak için tıklayın</string>
+    <string name="no_trainings">Hiçbir eğitimin yok, henüz!</string>
+    <string name="no_bows">Yay yok</string>
+    <string name="no_arrows">Ok yok</string>
+    <string name="version_info">Sürüm bilgisi</string>
+    <string name="version_prefix">Sürüm</string>
+    <string name="max_arrow_number">En fazla ok sayısı</string>
+    <string name="distances">Mesafe</string>
+    <string name="diameters">Çap</string>
+    <string name="bows">Yaylar</string>
+    <string name="reset">Sıfırla</string>
+    <string name="end_x_of_y">Bitiş %1$d/%2$d</string>
+    <string name="round_x_of_y">Tur %1$d/%2$d</string>
+    <string name="settings_summary_timer">Okçuluk zamanlayıcısının davranışını ayarlayın</string>
+    <string name="settings_summary_scoreboard">Skorbord görünümünü değiştir</string>
+    <string name="settings_summary_input">Giriş ekranını özelleştirme</string>
+    <string name="settings_summary_overview">Eğitimler, yuvarlaklıklar ve bitenler için gösterilen bilgileri kişiselleştirin</string>
+    <string name="settings_summary_profile">Kişisel bilgileri girin</string>
+    <string name="licence_number">Lisans numarası</string>
+    <string name="file_type">Dosya tipi</string>
+    <string name="clear">Açık</string>
+    <string name="tap_to_sign">İmzalamak için dokunun</string>
+    <string name="pdf_file">PDF dosyası</string>
+    <string name="image_file">Görüntü dosyası</string>
+    <string name="settings_summary_statistics">İstatistik ekranını ayarla</string>
+    <string name="settings_statistics_spots_to_single_target">Noktaları tek hedefe topla</string>
+    <string name="keep_above_lockscreen">Kilit ekranın üstünde tutun</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a5f5cbfc9..d75c87be1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -15,383 +15,384 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Налаштування</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Назад</string>
-  <string name="next">Далі</string>
-  <string name="save">Зберегти</string>
-  <string name="custom">Власне</string>
-  <string name="training">Тренування</string>
-  <string name="bow">Лук</string>
-  <string name="arrow">Стріли</string>
-  <string name="round">Раунд</string>
-  <string name="points">Очки</string>
-  <string name="passe">Серія</string>
-  <!-- Overview -->
-  <string name="new_training">Нове тренування</string>
-  <string name="new_bow">Новий лук</string>
-  <string name="new_arrow">Нові стріли</string>
-  <string name="new_round">Новий раунд</string>
-  <plurals name="training_selected">
-    <item quantity="one">%d training selected</item>
-    <item quantity="few">%d trainings selected</item>
-    <item quantity="many">%d trainings selected</item>
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="one">%d bow selected</item>
-    <item quantity="few">%d bows selected</item>
-    <item quantity="many">%d bows selected</item>
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="few">%d arrows selected</item>
-    <item quantity="many">%d arrows selected</item>
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="one">%d end selected</item>
-    <item quantity="few">%d ends selected</item>
-    <item quantity="many">%d ends selected</item>
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Редагувати</string>
-  <string name="delete">Вилучити</string>
-  <string name="statistic">Статистика</string>
-  <!-- Share -->
-  <string name="share">Поділитися</string>
-  <string name="dispersion_pattern">Розсіювання</string>
-  <string name="sharing_failed">Поділитися не вдалось!</string>
-  <!-- Export -->
-  <string name="send_exported">Відправити дані</string>
-  <string name="exporting_failed">Помилка експорту!</string>
-  <!-- New bow -->
-  <string name="add_bow">Додати лук</string>
-  <string name="name">Ім’я</string>
-  <string name="bow_type">Тип луку</string>
-  <string name="properties">Властивості</string>
-  <string name="brand">Бренд</string>
-  <string name="size">Розмір</string>
-  <string name="description">Опис</string>
-  <string name="height">База</string>
-  <string name="tiller">Тілер</string>
-  <string name="sight_settings">Опції прицілу</string>
-  <string name="add">Додати</string>
-  <string name="take_picture">Зробити фото</string>
-  <string name="pick_from_gallery">Вибрати зображення з «Галереї»</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Додати стрілу</string>
-  <string name="length">Довжина</string>
-  <string name="spine">Жорсткість</string>
-  <string name="weight">Вага</string>
-  <string name="vanes">Оперення</string>
-  <string name="nock">Хвостовик</string>
-  <string name="material">Матеріал</string>
-  <!-- New round -->
-  <string name="title">Назва</string>
-  <string name="outdoor">Вулиця</string>
-  <string name="indoor">Приміщення</string>
-  <string name="distance">Відстань</string>
-  <string name="format">Формат</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="one">%d серія</item>
-    <item quantity="few">%d серій</item>
-    <item quantity="many">%d ends</item>
-    <item quantity="other">%d серій</item>
-  </plurals>
-  <string name="with">по</string>
-  <plurals name="arrow">
-    <item quantity="one">%d стріла</item>
-    <item quantity="few">%d стріли</item>
-    <item quantity="many">%d arrows</item>
-    <item quantity="other">%d стріл</item>
-  </plurals>
-  <string name="target_face">Тип мішені</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Результат</string>
-  <string name="arrows">Стріли</string>
-  <string name="sum">Бали</string>
-  <string name="carry">Підсумок</string>
-  <string name="action_print">Друк</string>
-  <string name="average">Середнє</string>
-  <!-- Input mode -->
-  <string name="comment">Коментар</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Виберіть файл</string>
-  <string name="dir_not_created">Не вдалося створити теку!</string>
-  <string name="import_failed">Помилка імпорту!</string>
-  <string name="file_not_found">Файл не найдено!</string>
-  <string name="failed_reading_file">Помилка файлу!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Дякуємо за вашу підтримку!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Таймер</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Приготуйся</string>
-  <string name="shooting">Стрільба</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Час стрільби</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Звук</string>
-  <string name="timer_vibrate">Вібрувати</string>
-  <!-- Settings -->
-  <string name="backup_action">Резервне копіювання</string>
-  <string name="import_action">Імпорт</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Версія %s</string>
-  <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="few">%d seconds</item>
-    <item quantity="many">%d seconds</item>
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Інформація</string>
-  <string name="data">Дані</string>
-  <string name="weather">Погода</string>
-  <string name="environment">Оточення</string>
-  <string name="wind_speed">Швидкість вітру</string>
-  <string name="wind_direction">Напрям вітру</string>
-  <string name="sight_setting_removed">Налаштування прицілу видалені!</string>
-  <string name="metric">Метрична система</string>
-  <string name="imperial">Англійська система</string>
-  <string name="undo">Скасувати</string>
-  <string name="standard_rounds">Типовий раунд</string>
-  <string name="expand_collapse">Розгорнути/згорнути</string>
-  <string name="new_round_template">Новий шаблон</string>
-  <string name="arrow_numbers">Номери стріл</string>
-  <string name="round_removed">Раунд видалено!</string>
-  <string name="custom_round">Власний раунд</string>
-  <string name="filter">Фільтр</string>
-  <string name="club">Клуб</string>
-  <string name="target">Мішень</string>
-  <string name="standard_round">Типовий раунд</string>
-  <string name="use_as_template">Використати шаблон?</string>
-  <string name="create_copy">Це типовий раунд! \ \n Створити копію замість редагування?</string>
-  <string name="practice">Тренування</string>
-  <string name="edit_training">Редагувати тренінг</string>
-  <string name="edit_standard_round">Змінити типовий раунд</string>
-  <plurals name="arrow_deleted">
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="few">%d arrows deleted</item>
-    <item quantity="many">%d arrows deleted</item>
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="few">%d bows deleted</item>
-    <item quantity="many">%d bows deleted</item>
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="one">%d training deleted</item>
-    <item quantity="few">%d trainings deleted</item>
-    <item quantity="many">%d trainings deleted</item>
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="one">%d end deleted</item>
-    <item quantity="few">%d ends deleted</item>
-    <item quantity="many">%d ends deleted</item>
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="one">Раунд %d</item>
-    <item quantity="few">Раунд %d</item>
-    <item quantity="many">Round %d</item>
-    <item quantity="other">Раунд %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="one">Раунд %d обрано</item>
-    <item quantity="few">%d rounds selected</item>
-    <item quantity="many">%d rounds selected</item>
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="one">Раунд %d видалено</item>
-    <item quantity="few">%d rounds deleted</item>
-    <item quantity="many">%d rounds deleted</item>
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Дата</string>
-  <string name="edit_round">Змінити раунд</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Приціл</string>
-  <string name="limbs">Плечі</string>
-  <string name="my_bow">Мій лук</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Друкувати</string>
-  <string name="table">Table</string>
-  <string name="comments">Коментарі</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Стабілізатор</string>
-  <string name="clicker">Клікер</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Тренування у типовому раунді</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">Про додаток</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Особлива подяка</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Приєднуйтесь до нас на Google+</string>
-  <string name="share_with_friends">Розповісти друзям</string>
-  <string name="donate">Підтримати проект</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Перекласти на Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Пошук</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Поточний раунд</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Профіль</string>
-  <string name="birthday">Дата народження</string>
-  <string name="first_name">Ім\'я</string>
-  <string name="last_name">Прізвище</string>
-  <string name="age">Вік</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Стрілець</string>
-  <string name="hits">Влучень</string>
-  <string name="misses">Промахи</string>
-  <string name="new_end">Нова серія</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Діаметр</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Змінити тип мішені</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Клавіатура</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Створити резервну копію</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore"> Відновити</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Щодня</string>
-  <string name="weekly">Щотиждень</string>
-  <string name="monthly">Щомісяця</string>
-  <string name="connection_failed">Помилка з’єднання!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">Серія %1$d/%2$d</string>
-  <string name="round_x_of_y">Раунд %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Налаштування</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Назад</string>
+    <string name="next">Далі</string>
+    <string name="save">Зберегти</string>
+    <string name="custom">Власне</string>
+    <string name="training">Тренування</string>
+    <string name="bow">Лук</string>
+    <string name="arrow">Стріли</string>
+    <string name="round">Раунд</string>
+    <string name="points">Очки</string>
+    <string name="passe">Серія</string>
+    <!-- Overview -->
+    <string name="new_training">Нове тренування</string>
+    <string name="new_bow">Новий лук</string>
+    <string name="new_arrow">Нові стріли</string>
+    <string name="new_round">Новий раунд</string>
+    <plurals name="training_selected">
+        <item quantity="one">%d training selected</item>
+        <item quantity="few">%d trainings selected</item>
+        <item quantity="many">%d trainings selected</item>
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="one">%d bow selected</item>
+        <item quantity="few">%d bows selected</item>
+        <item quantity="many">%d bows selected</item>
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="one">%d arrow selected</item>
+        <item quantity="few">%d arrows selected</item>
+        <item quantity="many">%d arrows selected</item>
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="one">%d end selected</item>
+        <item quantity="few">%d ends selected</item>
+        <item quantity="many">%d ends selected</item>
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Редагувати</string>
+    <string name="delete">Вилучити</string>
+    <string name="statistic">Статистика</string>
+    <!-- Share -->
+    <string name="share">Поділитися</string>
+    <string name="dispersion_pattern">Розсіювання</string>
+    <string name="sharing_failed">Поділитися не вдалось!</string>
+    <!-- Export -->
+    <string name="send_exported">Відправити дані</string>
+    <string name="exporting_failed">Помилка експорту!</string>
+    <!-- New bow -->
+    <string name="add_bow">Додати лук</string>
+    <string name="name">Ім’я</string>
+    <string name="bow_type">Тип луку</string>
+    <string name="properties">Властивості</string>
+    <string name="brand">Бренд</string>
+    <string name="size">Розмір</string>
+    <string name="description">Опис</string>
+    <string name="height">База</string>
+    <string name="tiller">Тілер</string>
+    <string name="sight_settings">Опції прицілу</string>
+    <string name="add">Додати</string>
+    <string name="take_picture">Зробити фото</string>
+    <string name="pick_from_gallery">Вибрати зображення з «Галереї»</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Додати стрілу</string>
+    <string name="length">Довжина</string>
+    <string name="spine">Жорсткість</string>
+    <string name="weight">Вага</string>
+    <string name="vanes">Оперення</string>
+    <string name="nock">Хвостовик</string>
+    <string name="material">Матеріал</string>
+    <!-- New round -->
+    <string name="title">Назва</string>
+    <string name="outdoor">Вулиця</string>
+    <string name="indoor">Приміщення</string>
+    <string name="distance">Відстань</string>
+    <string name="format">Формат</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="one">%d серія</item>
+        <item quantity="few">%d серій</item>
+        <item quantity="many">%d ends</item>
+        <item quantity="other">%d серій</item>
+    </plurals>
+    <string name="with">по</string>
+    <plurals name="arrow">
+        <item quantity="one">%d стріла</item>
+        <item quantity="few">%d стріли</item>
+        <item quantity="many">%d arrows</item>
+        <item quantity="other">%d стріл</item>
+    </plurals>
+    <string name="target_face">Тип мішені</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Результат</string>
+    <string name="arrows">Стріли</string>
+    <string name="sum">Бали</string>
+    <string name="carry">Підсумок</string>
+    <string name="action_print">Друк</string>
+    <string name="average">Середнє</string>
+    <!-- Input mode -->
+    <string name="comment">Коментар</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Виберіть файл</string>
+    <string name="dir_not_created">Не вдалося створити теку!</string>
+    <string name="import_failed">Помилка імпорту!</string>
+    <string name="file_not_found">Файл не найдено!</string>
+    <string name="failed_reading_file">Помилка файлу!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Дякуємо за вашу підтримку!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Таймер</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Приготуйся</string>
+    <string name="shooting">Стрільба</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Час стрільби</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Звук</string>
+    <string name="timer_vibrate">Вібрувати</string>
+    <!-- Settings -->
+    <string name="backup_action">Резервне копіювання</string>
+    <string name="import_action">Імпорт</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Версія %s</string>
+    <plurals name="second">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Інформація</string>
+    <string name="data">Дані</string>
+    <string name="weather">Погода</string>
+    <string name="environment">Оточення</string>
+    <string name="wind_speed">Швидкість вітру</string>
+    <string name="wind_direction">Напрям вітру</string>
+    <string name="sight_setting_removed">Налаштування прицілу видалені!</string>
+    <string name="metric">Метрична система</string>
+    <string name="imperial">Англійська система</string>
+    <string name="undo">Скасувати</string>
+    <string name="standard_rounds">Типовий раунд</string>
+    <string name="expand_collapse">Розгорнути/згорнути</string>
+    <string name="new_round_template">Новий шаблон</string>
+    <string name="arrow_numbers">Номери стріл</string>
+    <string name="round_removed">Раунд видалено!</string>
+    <string name="custom_round">Власний раунд</string>
+    <string name="filter">Фільтр</string>
+    <string name="club">Клуб</string>
+    <string name="target">Мішень</string>
+    <string name="standard_round">Типовий раунд</string>
+    <string name="use_as_template">Використати шаблон?</string>
+    <string name="create_copy">Це типовий раунд! \ \n Створити копію замість редагування?</string>
+    <string name="practice">Тренування</string>
+    <string name="edit_training">Редагувати тренінг</string>
+    <string name="edit_standard_round">Змінити типовий раунд</string>
+    <plurals name="arrow_deleted">
+        <item quantity="one">%d arrow deleted</item>
+        <item quantity="few">%d arrows deleted</item>
+        <item quantity="many">%d arrows deleted</item>
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="one">%d bow deleted</item>
+        <item quantity="few">%d bows deleted</item>
+        <item quantity="many">%d bows deleted</item>
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="one">%d training deleted</item>
+        <item quantity="few">%d trainings deleted</item>
+        <item quantity="many">%d trainings deleted</item>
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="one">%d end deleted</item>
+        <item quantity="few">%d ends deleted</item>
+        <item quantity="many">%d ends deleted</item>
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="one">Раунд %d</item>
+        <item quantity="few">Раунд %d</item>
+        <item quantity="many">Round %d</item>
+        <item quantity="other">Раунд %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="one">Раунд %d обрано</item>
+        <item quantity="few">%d rounds selected</item>
+        <item quantity="many">%d rounds selected</item>
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="one">Раунд %d видалено</item>
+        <item quantity="few">%d rounds deleted</item>
+        <item quantity="many">%d rounds deleted</item>
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Дата</string>
+    <string name="edit_round">Змінити раунд</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Приціл</string>
+    <string name="limbs">Плечі</string>
+    <string name="my_bow">Мій лук</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Друкувати</string>
+    <string name="table">Table</string>
+    <string name="comments">Коментарі</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Стабілізатор</string>
+    <string name="clicker">Клікер</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Тренування у типовому раунді</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">Про додаток</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Особлива подяка</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Розповісти друзям</string>
+    <string name="donate">Підтримати проект</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Перекласти на Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Пошук</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Поточний раунд</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Профіль</string>
+    <string name="birthday">Дата народження</string>
+    <string name="first_name">Ім\'я</string>
+    <string name="last_name">Прізвище</string>
+    <string name="age">Вік</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Стрілець</string>
+    <string name="hits">Влучень</string>
+    <string name="misses">Промахи</string>
+    <string name="new_end">Нова серія</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Діаметр</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Змінити тип мішені</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Клавіатура</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Створити резервну копію</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore"> Відновити</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Щодня</string>
+    <string name="weekly">Щотиждень</string>
+    <string name="monthly">Щомісяця</string>
+    <string name="connection_failed">Помилка з’єднання!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">Серія %1$d/%2$d</string>
+    <string name="round_x_of_y">Раунд %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 078d10699..9a9e12f08 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">Options</string>
-  <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
-  <!-- Overview -->
-  <string name="new_training">New training</string>
-  <string name="new_bow">New bow</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d trainings selected</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d bows selected</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d arrows selected</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d ends selected</item>
-  </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
-  <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
-  <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
-  <string name="height">Brace height</string>
-  <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
-  <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
-  <string name="nock">Nock</string>
-  <string name="material">Material</string>
-  <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d ends</item>
-  </plurals>
-  <string name="with">of</string>
-  <plurals name="arrow">
-    <item quantity="other">%d arrows</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
-  <!-- Input mode -->
-  <string name="comment">Comment</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
-  <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
-  <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
-  <plurals name="second">
-    <item quantity="other">%d seconds</item>
-  </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">Options</string>
+    <string name="settings">Settings</string>
+    <string name="prev">Previous</string>
+    <string name="next">Next</string>
+    <string name="save">Save</string>
+    <string name="custom">Custom</string>
+    <string name="training">Training</string>
+    <string name="bow">Bow</string>
+    <string name="arrow">Arrow</string>
+    <string name="round">Round</string>
+    <string name="points">Points</string>
+    <string name="passe">End</string>
+    <!-- Overview -->
+    <string name="new_training">New training</string>
+    <string name="new_bow">New bow</string>
+    <string name="new_arrow">New arrow</string>
+    <string name="new_round">New round</string>
+    <plurals name="training_selected">
+        <item quantity="other">%d trainings selected</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">%d bows selected</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">%d arrows selected</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">%d ends selected</item>
+    </plurals>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="statistic">Statistic</string>
+    <!-- Share -->
+    <string name="share">Share</string>
+    <string name="dispersion_pattern">Dispersion pattern</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">Send exported data</string>
+    <string name="exporting_failed">Exporting failed!</string>
+    <!-- New bow -->
+    <string name="add_bow">Add bow</string>
+    <string name="name">Name</string>
+    <string name="bow_type">Bow type</string>
+    <string name="properties">Properties</string>
+    <string name="brand">Brand</string>
+    <string name="size">Size</string>
+    <string name="description">Description</string>
+    <string name="height">Brace height</string>
+    <string name="tiller">Tiller</string>
+    <string name="sight_settings">Sight settings</string>
+    <string name="add">Add</string>
+    <string name="take_picture">Take a picture</string>
+    <string name="pick_from_gallery">Select a picture from gallery</string>
+    <!-- New arrow -->
+    <string name="add_arrow">Add arrow</string>
+    <string name="length">Length</string>
+    <string name="spine">Spine</string>
+    <string name="weight">Weight</string>
+    <string name="vanes">Vanes</string>
+    <string name="nock">Nock</string>
+    <string name="material">Material</string>
+    <!-- New round -->
+    <string name="title">Title</string>
+    <string name="outdoor">Outdoor</string>
+    <string name="indoor">Indoor</string>
+    <string name="distance">Distance</string>
+    <string name="format">Format</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d ends</item>
+    </plurals>
+    <string name="with">of</string>
+    <plurals name="arrow">
+        <item quantity="other">%d arrows</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">Scoreboard</string>
+    <string name="arrows">Arrows</string>
+    <string name="sum">Score</string>
+    <string name="carry">R.Total</string>
+    <string name="action_print">Print</string>
+    <string name="average">Average</string>
+    <!-- Input mode -->
+    <string name="comment">Comment</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">Select a file</string>
+    <string name="dir_not_created">Directory could not be created!</string>
+    <string name="import_failed">Import failed!</string>
+    <string name="file_not_found">File not found!</string>
+    <string name="failed_reading_file">Failed reading file!</string>
+    <!-- Donate -->
+    <string name="donate_2">Donate me a burger</string>
+    <string name="donate_5">Donate me a kebab</string>
+    <string name="donate_10">Donate me a large pizza</string>
+    <string name="donate_20">Donate me some fuel</string>
+    <string name="donation_thank">Thank you for your support!</string>
+    <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">Timer</string>
+    <string name="touch_to_start">Touch to start</string>
+    <string name="preparation">Get ready</string>
+    <string name="shooting">Shooting</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">Shooting Time</string>
+    <string name="timer_waiting_time">Prepare Time</string>
+    <string name="timer_warning_time">Warning Time</string>
+    <string name="timer_sound">Sound</string>
+    <string name="timer_vibrate">Vibrate</string>
+    <!-- Settings -->
+    <string name="backup_action">Backup</string>
+    <string name="import_action">Import</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">Open Source-Licences</string>
+    <string name="licences_summary">Legal notes to licences</string>
+    <string name="version">Version %s</string>
+    <plurals name="second">
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <string name="info">Information</string>
+    <string name="data">Data</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">Undo</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">End %1$d/%2$d</string>
+    <string name="round_x_of_y">Round %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d5a90250e..d1823301f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">选项</string>
-  <string name="settings">更多设置</string>
-  <string name="prev">上一页</string>
-  <string name="next">下一页</string>
-  <string name="save">保存</string>
-  <string name="custom">自定义</string>
-  <string name="training">训练</string>
-  <string name="bow">弓</string>
-  <string name="arrow">箭支</string>
-  <string name="round">回合</string>
-  <string name="points">得分</string>
-  <string name="passe">结束</string>
-  <!-- Overview -->
-  <string name="new_training">新的训练</string>
-  <string name="new_bow">新弓</string>
-  <string name="new_arrow">新箭支</string>
-  <string name="new_round">新一回合</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d 训练已选择</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d 弓已选择</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d 箭支已选择</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d 端点已选择</item>
-  </plurals>
-  <string name="edit">编辑</string>
-  <string name="delete">删除</string>
-  <string name="statistic">统计</string>
-  <!-- Share -->
-  <string name="share">分享</string>
-  <string name="dispersion_pattern">散步模式</string>
-  <string name="sharing_failed">分享失败！</string>
-  <!-- Export -->
-  <string name="send_exported">发送导出的数据</string>
-  <string name="exporting_failed">导出失败！</string>
-  <!-- New bow -->
-  <string name="add_bow">添加新弓</string>
-  <string name="name">弓名</string>
-  <string name="bow_type">弓型</string>
-  <string name="properties">属性</string>
-  <string name="brand">品牌</string>
-  <string name="size">弓长</string>
-  <string name="description">说明</string>
-  <string name="height">弦距（弓档）</string>
-  <string name="tiller">弓档差</string>
-  <string name="sight_settings">瞄具设置</string>
-  <string name="add">添加</string>
-  <string name="take_picture">拍摄照片</string>
-  <string name="pick_from_gallery">从图库中选择一张图片</string>
-  <!-- New arrow -->
-  <string name="add_arrow">添加新箭支</string>
-  <string name="length">长度</string>
-  <string name="spine">挠度</string>
-  <string name="weight">重量</string>
-  <string name="vanes">箭羽</string>
-  <string name="nock">箭尾</string>
-  <string name="material">材质</string>
-  <!-- New round -->
-  <string name="title">标题</string>
-  <string name="outdoor">户外</string>
-  <string name="indoor">室内</string>
-  <string name="distance">距离</string>
-  <string name="format">方式</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d 结束</item>
-  </plurals>
-  <string name="with">共</string>
-  <plurals name="arrow">
-    <item quantity="other">%d 箭支</item>
-  </plurals>
-  <string name="target_face">靶面</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">记分牌</string>
-  <string name="arrows">箭支</string>
-  <string name="sum">总计</string>
-  <string name="carry">核</string>
-  <string name="action_print">打印</string>
-  <string name="average">平均</string>
-  <!-- Input mode -->
-  <string name="comment">备注</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">选择文件</string>
-  <string name="dir_not_created">无法创建目录！</string>
-  <string name="import_failed">导入失败！</string>
-  <string name="file_not_found">未找到文件！</string>
-  <string name="failed_reading_file">文件读取失败！</string>
-  <!-- Donate -->
-  <string name="donate_2">捐助我一个汉堡</string>
-  <string name="donate_5">捐助我一串烤肉</string>
-  <string name="donate_10">捐助我一个大披萨</string>
-  <string name="donate_20">捐助我一些燃料</string>
-  <string name="donation_thank">谢谢您的支持 ！</string>
-  <string name="donate_text" formatted="false">款项含有增值税和给谷歌的30%费用。你可能乐意直接捐助到PayPal帐户 dreier.florian@gmail.com。</string>
-  <!-- Timer -->
-  <string name="timer">定时器</string>
-  <string name="touch_to_start">触摸启动</string>
-  <string name="preparation">做好准备</string>
-  <string name="shooting">射击</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">射击时间</string>
-  <string name="timer_waiting_time">准备时间</string>
-  <string name="timer_warning_time">警告时间</string>
-  <string name="timer_sound">声音</string>
-  <string name="timer_vibrate">振动</string>
-  <!-- Settings -->
-  <string name="backup_action">备份</string>
-  <string name="import_action">导入</string>
-  <string name="exports_as_csv">导出为 csv</string>
-  <string name="licences">开源许可</string>
-  <string name="licences_summary">法律许可</string>
-  <string name="version">版本 %s</string>
-  <plurals name="second">
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <string name="info">关于</string>
-  <string name="data">数据</string>
-  <string name="weather">天气</string>
-  <string name="environment">环境</string>
-  <string name="wind_speed">风速</string>
-  <string name="wind_direction">风向</string>
-  <string name="sight_setting_removed">瞄具设置已删除！</string>
-  <string name="metric">公制</string>
-  <string name="imperial">英制</string>
-  <string name="undo">撤销</string>
-  <string name="standard_rounds">标准回合</string>
-  <string name="expand_collapse">展开/折叠</string>
-  <string name="new_round_template">新的模板</string>
-  <string name="arrow_numbers">箭支数</string>
-  <string name="round_removed">回合已删除！</string>
-  <string name="custom_round">自定义回合</string>
-  <string name="filter">过滤器</string>
-  <string name="club">俱乐部</string>
-  <string name="target">目标</string>
-  <string name="standard_round">标准回合</string>
-  <string name="use_as_template">作为模板使用？</string>
-  <string name="create_copy">这是一个标准回合！ \nDo 您想要创建一个副本，以便对其进行编辑吗？</string>
-  <string name="practice">练习</string>
-  <string name="edit_training">编辑训练</string>
-  <string name="edit_standard_round">编辑标准回合</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d 箭支删除</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d 弓已删除</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d 训练已删除</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d 端点已删除</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">回合 %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d 选择端点</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d 端点已删除</item>
-  </plurals>
-  <string name="date">日期</string>
-  <string name="edit_round">编辑回合</string>
-  <string name="draw_weight">弓拉力</string>
-  <string name="sight">瞄具</string>
-  <string name="limbs">弓片</string>
-  <string name="my_bow">我的弓</string>
-  <string name="my_arrow">我的箭支</string>
-  <string name="tip_weight">箭头重量</string>
-  <string name="arrow_ranking">箭头排列</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">转换成PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">语言</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">打开抽屉</string>
-  <string name="drawer_close">关闭抽屉</string>
-  <string name="help">帮助</string>
-  <string name="home">主页</string>
-  <string name="click_to_enter_profile">点击进入配置文件信息</string>
-  <string name="no_trainings">你没有任何的培训</string>
-  <string name="no_bows">没有弓</string>
-  <string name="no_arrows">没有箭</string>
-  <string name="version_info">版本信息</string>
-  <string name="version_prefix">版本</string>
-  <string name="max_arrow_number">最大的箭头号码</string>
-  <string name="distances">距离</string>
-  <string name="diameters">直径</string>
-  <string name="bows">弓</string>
-  <string name="reset">重置</string>
-  <string name="end_x_of_y">结束 %1$d/%2$d</string>
-  <string name="round_x_of_y">回合 %1$d/%2$d</string>
-  <string name="settings_summary_timer">调整射箭计时器的行为</string>
-  <string name="settings_summary_scoreboard">更改记分板外观</string>
-  <string name="settings_summary_input">自定义输入屏幕</string>
-  <string name="settings_summary_overview">个性化培训、查询和结束所显示的信息</string>
-  <string name="settings_summary_profile">输入个人信息</string>
-  <string name="licence_number">牌照号码</string>
-  <string name="file_type">文件类型</string>
-  <string name="clear">清除</string>
-  <string name="tap_to_sign">轻触以登录</string>
-  <string name="pdf_file">PDF文件</string>
-  <string name="image_file">图像文件</string>
-  <string name="settings_summary_statistics">调整统计屏幕</string>
-  <string name="settings_statistics_spots_to_single_target">聚集点到单个目标</string>
-  <string name="keep_above_lockscreen">在锁屏界面上保持显示</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">选项</string>
+    <string name="settings">更多设置</string>
+    <string name="prev">上一页</string>
+    <string name="next">下一页</string>
+    <string name="save">保存</string>
+    <string name="custom">自定义</string>
+    <string name="training">训练</string>
+    <string name="bow">弓</string>
+    <string name="arrow">箭支</string>
+    <string name="round">回合</string>
+    <string name="points">得分</string>
+    <string name="passe">结束</string>
+    <!-- Overview -->
+    <string name="new_training">新的训练</string>
+    <string name="new_bow">新弓</string>
+    <string name="new_arrow">新箭支</string>
+    <string name="new_round">新一回合</string>
+    <plurals name="training_selected">
+        <item quantity="other">%d 训练已选择</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">%d 弓已选择</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">%d 箭支已选择</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">%d 端点已选择</item>
+    </plurals>
+    <string name="edit">编辑</string>
+    <string name="delete">删除</string>
+    <string name="statistic">统计</string>
+    <!-- Share -->
+    <string name="share">分享</string>
+    <string name="dispersion_pattern">散步模式</string>
+    <string name="sharing_failed">分享失败！</string>
+    <!-- Export -->
+    <string name="send_exported">发送导出的数据</string>
+    <string name="exporting_failed">导出失败！</string>
+    <!-- New bow -->
+    <string name="add_bow">添加新弓</string>
+    <string name="name">弓名</string>
+    <string name="bow_type">弓型</string>
+    <string name="properties">属性</string>
+    <string name="brand">品牌</string>
+    <string name="size">弓长</string>
+    <string name="description">说明</string>
+    <string name="height">弦距（弓档）</string>
+    <string name="tiller">弓档差</string>
+    <string name="sight_settings">瞄具设置</string>
+    <string name="add">添加</string>
+    <string name="take_picture">拍摄照片</string>
+    <string name="pick_from_gallery">从图库中选择一张图片</string>
+    <!-- New arrow -->
+    <string name="add_arrow">添加新箭支</string>
+    <string name="length">长度</string>
+    <string name="spine">挠度</string>
+    <string name="weight">重量</string>
+    <string name="vanes">箭羽</string>
+    <string name="nock">箭尾</string>
+    <string name="material">材质</string>
+    <!-- New round -->
+    <string name="title">标题</string>
+    <string name="outdoor">户外</string>
+    <string name="indoor">室内</string>
+    <string name="distance">距离</string>
+    <string name="format">方式</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d 结束</item>
+    </plurals>
+    <string name="with">共</string>
+    <plurals name="arrow">
+        <item quantity="other">%d 箭支</item>
+    </plurals>
+    <string name="target_face">靶面</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">记分牌</string>
+    <string name="arrows">箭支</string>
+    <string name="sum">总计</string>
+    <string name="carry">核</string>
+    <string name="action_print">打印</string>
+    <string name="average">平均</string>
+    <!-- Input mode -->
+    <string name="comment">备注</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">选择文件</string>
+    <string name="dir_not_created">无法创建目录！</string>
+    <string name="import_failed">导入失败！</string>
+    <string name="file_not_found">未找到文件！</string>
+    <string name="failed_reading_file">文件读取失败！</string>
+    <!-- Donate -->
+    <string name="donate_2">捐助我一个汉堡</string>
+    <string name="donate_5">捐助我一串烤肉</string>
+    <string name="donate_10">捐助我一个大披萨</string>
+    <string name="donate_20">捐助我一些燃料</string>
+    <string name="donation_thank">谢谢您的支持 ！</string>
+    <string name="donate_text" formatted="false">款项含有增值税和给谷歌的30%费用。你可能乐意直接捐助到PayPal帐户 dreier.florian@gmail.com。</string>
+    <!-- Timer -->
+    <string name="timer">定时器</string>
+    <string name="touch_to_start">触摸启动</string>
+    <string name="preparation">做好准备</string>
+    <string name="shooting">射击</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">射击时间</string>
+    <string name="timer_waiting_time">准备时间</string>
+    <string name="timer_warning_time">警告时间</string>
+    <string name="timer_sound">声音</string>
+    <string name="timer_vibrate">振动</string>
+    <!-- Settings -->
+    <string name="backup_action">备份</string>
+    <string name="import_action">导入</string>
+    <string name="exports_as_csv">导出为 csv</string>
+    <string name="licences">开源许可</string>
+    <string name="licences_summary">法律许可</string>
+    <string name="version">版本 %s</string>
+    <plurals name="second">
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <string name="info">关于</string>
+    <string name="data">数据</string>
+    <string name="weather">天气</string>
+    <string name="environment">环境</string>
+    <string name="wind_speed">风速</string>
+    <string name="wind_direction">风向</string>
+    <string name="sight_setting_removed">瞄具设置已删除！</string>
+    <string name="metric">公制</string>
+    <string name="imperial">英制</string>
+    <string name="undo">撤销</string>
+    <string name="standard_rounds">标准回合</string>
+    <string name="expand_collapse">展开/折叠</string>
+    <string name="new_round_template">新的模板</string>
+    <string name="arrow_numbers">箭支数</string>
+    <string name="round_removed">回合已删除！</string>
+    <string name="custom_round">自定义回合</string>
+    <string name="filter">过滤器</string>
+    <string name="club">俱乐部</string>
+    <string name="target">目标</string>
+    <string name="standard_round">标准回合</string>
+    <string name="use_as_template">作为模板使用？</string>
+    <string name="create_copy">这是一个标准回合！ \nDo 您想要创建一个副本，以便对其进行编辑吗？</string>
+    <string name="practice">练习</string>
+    <string name="edit_training">编辑训练</string>
+    <string name="edit_standard_round">编辑标准回合</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d 箭支删除</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d 弓已删除</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d 训练已删除</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d 端点已删除</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">回合 %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d 选择端点</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">%d 端点已删除</item>
+    </plurals>
+    <string name="date">日期</string>
+    <string name="edit_round">编辑回合</string>
+    <string name="draw_weight">弓拉力</string>
+    <string name="sight">瞄具</string>
+    <string name="limbs">弓片</string>
+    <string name="my_bow">我的弓</string>
+    <string name="my_arrow">我的箭支</string>
+    <string name="tip_weight">箭头重量</string>
+    <string name="arrow_ranking">箭头排列</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">转换成PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">语言</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">打开抽屉</string>
+    <string name="drawer_close">关闭抽屉</string>
+    <string name="help">帮助</string>
+    <string name="home">主页</string>
+    <string name="click_to_enter_profile">点击进入配置文件信息</string>
+    <string name="no_trainings">你没有任何的培训</string>
+    <string name="no_bows">没有弓</string>
+    <string name="no_arrows">没有箭</string>
+    <string name="version_info">版本信息</string>
+    <string name="version_prefix">版本</string>
+    <string name="max_arrow_number">最大的箭头号码</string>
+    <string name="distances">距离</string>
+    <string name="diameters">直径</string>
+    <string name="bows">弓</string>
+    <string name="reset">重置</string>
+    <string name="end_x_of_y">结束 %1$d/%2$d</string>
+    <string name="round_x_of_y">回合 %1$d/%2$d</string>
+    <string name="settings_summary_timer">调整射箭计时器的行为</string>
+    <string name="settings_summary_scoreboard">更改记分板外观</string>
+    <string name="settings_summary_input">自定义输入屏幕</string>
+    <string name="settings_summary_overview">个性化培训、查询和结束所显示的信息</string>
+    <string name="settings_summary_profile">输入个人信息</string>
+    <string name="licence_number">牌照号码</string>
+    <string name="file_type">文件类型</string>
+    <string name="clear">清除</string>
+    <string name="tap_to_sign">轻触以登录</string>
+    <string name="pdf_file">PDF文件</string>
+    <string name="image_file">图像文件</string>
+    <string name="settings_summary_statistics">调整统计屏幕</string>
+    <string name="settings_statistics_spots_to_single_target">聚集点到单个目标</string>
+    <string name="keep_above_lockscreen">在锁屏界面上保持显示</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4640f165c..66f22990f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -15,341 +15,342 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- General -->
-  <string name="preferences">選擇</string>
-  <string name="settings">Settings</string>
-  <string name="prev">前一步</string>
-  <string name="next">下一步</string>
-  <string name="save">儲存</string>
-  <string name="custom">習慣</string>
-  <string name="training">訓練</string>
-  <string name="bow">弓</string>
-  <string name="arrow">箭</string>
-  <string name="round">輪</string>
-  <string name="points">環</string>
-  <string name="passe">局</string>
-  <!-- Overview -->
-  <string name="new_training">加入新訓練</string>
-  <string name="new_bow">加入新弓</string>
-  <string name="new_arrow">新的箭</string>
-  <string name="new_round">新一輪</string>
-  <plurals name="training_selected">
-    <item quantity="other">%d 已選擇的訓練</item>
-  </plurals>
-  <plurals name="bow_selected">
-    <item quantity="other">%d 已選擇的弓</item>
-  </plurals>
-  <plurals name="arrow_selected">
-    <item quantity="other">%d 已選擇的箭</item>
-  </plurals>
-  <plurals name="passe_selected">
-    <item quantity="other">%d 已選擇的局次</item>
-  </plurals>
-  <string name="edit">修改</string>
-  <string name="delete">刪除</string>
-  <string name="statistic">數據分析</string>
-  <!-- Share -->
-  <string name="share">分享</string>
-  <string name="dispersion_pattern">箭的落點</string>
-  <string name="sharing_failed">Sharing failed!</string>
-  <!-- Export -->
-  <string name="send_exported">傳送資料</string>
-  <string name="exporting_failed">傳送資料失敗!</string>
-  <!-- New bow -->
-  <string name="add_bow">加入新弓</string>
-  <string name="name">型號</string>
-  <string name="bow_type">弓種</string>
-  <string name="properties">器材資料</string>
-  <string name="brand">牌子</string>
-  <string name="size">長度</string>
-  <string name="description">備註</string>
-  <string name="height">弦距</string>
-  <string name="tiller">上下弦距差</string>
-  <string name="sight_settings">瞄準器刻度</string>
-  <string name="add">加入</string>
-  <string name="take_picture">拍新照片</string>
-  <string name="pick_from_gallery">從相庫中選擇</string>
-  <!-- New arrow -->
-  <string name="add_arrow">加入新箭</string>
-  <string name="length">長度</string>
-  <string name="spine">型號</string>
-  <string name="weight">重量</string>
-  <string name="vanes">羽片</string>
-  <string name="nock">箭尾</string>
-  <string name="material">材料</string>
-  <!-- New round -->
-  <string name="title">練習/賽事名稱</string>
-  <string name="outdoor">室外</string>
-  <string name="indoor">室內</string>
-  <string name="distance">距離</string>
-  <string name="format">賽制</string>
-  <!-- x ends of y arrows -->
-  <plurals name="passe">
-    <item quantity="other">%d 局</item>
-  </plurals>
-  <string name="with"> x </string>
-  <plurals name="arrow">
-    <item quantity="other">%d 箭</item>
-  </plurals>
-  <string name="target_face">Target face</string>
-  <!-- Scoreboard -->
-  <string name="scoreboard">分數板</string>
-  <string name="arrows">箭數</string>
-  <string name="sum">環數</string>
-  <string name="carry">總和</string>
-  <string name="action_print">列印</string>
-  <string name="average">平均</string>
-  <!-- Input mode -->
-  <string name="comment">備註</string>
-  <!-- Statistics -->
-  <!-- Import/Backup -->
-  <string name="select_a_file">選擇檔案</string>
-  <string name="dir_not_created">未能建立目錄</string>
-  <string name="import_failed">存取失敗!</string>
-  <string name="file_not_found">找不到資料!</string>
-  <string name="failed_reading_file">讀取資料失敗!</string>
-  <!-- Donate -->
-  <string name="donate_2">送我一個漢堡</string>
-  <string name="donate_5">送我一串烤肉</string>
-  <string name="donate_10">送我一份薄餅</string>
-  <string name="donate_20">送我一些汽油</string>
-  <string name="donation_thank">謝謝您的支持!</string>
-  <string name="donate_text" formatted="false">以上金額包含商品及服務稅, 三成金額將會繳交給谷歌(Google). 另外, 歡迎捐贈到 PayPal 帳號 dreier.florian@gmail.com.</string>
-  <!-- Timer -->
-  <string name="timer">計時器</string>
-  <string name="touch_to_start">觸碰螢幕開始</string>
-  <string name="preparation">預備</string>
-  <string name="shooting">發射</string>
-  <!-- Timer settings -->
-  <string name="timer_shooting_time">發射時間</string>
-  <string name="timer_waiting_time">預備時間</string>
-  <string name="timer_warning_time">提示時間</string>
-  <string name="timer_sound">音效</string>
-  <string name="timer_vibrate">震動</string>
-  <!-- Settings -->
-  <string name="backup_action">備份</string>
-  <string name="import_action">存取</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">開放程式許可</string>
-  <string name="licences_summary">法律聲明許可</string>
-  <string name="version">版本 %s</string>
-  <plurals name="second">
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <string name="info">資料</string>
-  <string name="data">數據</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">撤销</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
-  <plurals name="arrow_deleted">
-    <item quantity="other">%d arrows deleted</item>
-  </plurals>
-  <plurals name="bow_deleted">
-    <item quantity="other">%d bows deleted</item>
-  </plurals>
-  <plurals name="training_deleted">
-    <item quantity="other">%d trainings deleted</item>
-  </plurals>
-  <plurals name="passe_deleted">
-    <item quantity="other">%d ends deleted</item>
-  </plurals>
-  <plurals name="rounds">
-    <item quantity="other">Round %d</item>
-  </plurals>
-  <plurals name="round_selected">
-    <item quantity="other">%d rounds selected</item>
-  </plurals>
-  <plurals name="round_deleted">
-    <item quantity="other">%d rounds deleted</item>
-  </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
-  <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">局 %1$d/%2$d</string>
-  <string name="round_x_of_y">輪 %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="permission_required">Permission required</string>
-  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <!-- General -->
+    <string name="preferences">選擇</string>
+    <string name="settings">Settings</string>
+    <string name="prev">前一步</string>
+    <string name="next">下一步</string>
+    <string name="save">儲存</string>
+    <string name="custom">習慣</string>
+    <string name="training">訓練</string>
+    <string name="bow">弓</string>
+    <string name="arrow">箭</string>
+    <string name="round">輪</string>
+    <string name="points">環</string>
+    <string name="passe">局</string>
+    <!-- Overview -->
+    <string name="new_training">加入新訓練</string>
+    <string name="new_bow">加入新弓</string>
+    <string name="new_arrow">新的箭</string>
+    <string name="new_round">新一輪</string>
+    <plurals name="training_selected">
+        <item quantity="other">%d 已選擇的訓練</item>
+    </plurals>
+    <plurals name="bow_selected">
+        <item quantity="other">%d 已選擇的弓</item>
+    </plurals>
+    <plurals name="arrow_selected">
+        <item quantity="other">%d 已選擇的箭</item>
+    </plurals>
+    <plurals name="passe_selected">
+        <item quantity="other">%d 已選擇的局次</item>
+    </plurals>
+    <string name="edit">修改</string>
+    <string name="delete">刪除</string>
+    <string name="statistic">數據分析</string>
+    <!-- Share -->
+    <string name="share">分享</string>
+    <string name="dispersion_pattern">箭的落點</string>
+    <string name="sharing_failed">Sharing failed!</string>
+    <!-- Export -->
+    <string name="send_exported">傳送資料</string>
+    <string name="exporting_failed">傳送資料失敗!</string>
+    <!-- New bow -->
+    <string name="add_bow">加入新弓</string>
+    <string name="name">型號</string>
+    <string name="bow_type">弓種</string>
+    <string name="properties">器材資料</string>
+    <string name="brand">牌子</string>
+    <string name="size">長度</string>
+    <string name="description">備註</string>
+    <string name="height">弦距</string>
+    <string name="tiller">上下弦距差</string>
+    <string name="sight_settings">瞄準器刻度</string>
+    <string name="add">加入</string>
+    <string name="take_picture">拍新照片</string>
+    <string name="pick_from_gallery">從相庫中選擇</string>
+    <!-- New arrow -->
+    <string name="add_arrow">加入新箭</string>
+    <string name="length">長度</string>
+    <string name="spine">型號</string>
+    <string name="weight">重量</string>
+    <string name="vanes">羽片</string>
+    <string name="nock">箭尾</string>
+    <string name="material">材料</string>
+    <!-- New round -->
+    <string name="title">練習/賽事名稱</string>
+    <string name="outdoor">室外</string>
+    <string name="indoor">室內</string>
+    <string name="distance">距離</string>
+    <string name="format">賽制</string>
+    <!-- x ends of y arrows -->
+    <plurals name="passe">
+        <item quantity="other">%d 局</item>
+    </plurals>
+    <string name="with"> x </string>
+    <plurals name="arrow">
+        <item quantity="other">%d 箭</item>
+    </plurals>
+    <string name="target_face">Target face</string>
+    <!-- Scoreboard -->
+    <string name="scoreboard">分數板</string>
+    <string name="arrows">箭數</string>
+    <string name="sum">環數</string>
+    <string name="carry">總和</string>
+    <string name="action_print">列印</string>
+    <string name="average">平均</string>
+    <!-- Input mode -->
+    <string name="comment">備註</string>
+    <!-- Statistics -->
+    <!-- Import/Backup -->
+    <string name="select_a_file">選擇檔案</string>
+    <string name="dir_not_created">未能建立目錄</string>
+    <string name="import_failed">存取失敗!</string>
+    <string name="file_not_found">找不到資料!</string>
+    <string name="failed_reading_file">讀取資料失敗!</string>
+    <!-- Donate -->
+    <string name="donate_2">送我一個漢堡</string>
+    <string name="donate_5">送我一串烤肉</string>
+    <string name="donate_10">送我一份薄餅</string>
+    <string name="donate_20">送我一些汽油</string>
+    <string name="donation_thank">謝謝您的支持!</string>
+    <string name="donate_text" formatted="false">以上金額包含商品及服務稅, 三成金額將會繳交給谷歌(Google). 另外, 歡迎捐贈到 PayPal 帳號 dreier.florian@gmail.com.</string>
+    <!-- Timer -->
+    <string name="timer">計時器</string>
+    <string name="touch_to_start">觸碰螢幕開始</string>
+    <string name="preparation">預備</string>
+    <string name="shooting">發射</string>
+    <!-- Timer settings -->
+    <string name="timer_shooting_time">發射時間</string>
+    <string name="timer_waiting_time">預備時間</string>
+    <string name="timer_warning_time">提示時間</string>
+    <string name="timer_sound">音效</string>
+    <string name="timer_vibrate">震動</string>
+    <!-- Settings -->
+    <string name="backup_action">備份</string>
+    <string name="import_action">存取</string>
+    <string name="exports_as_csv">Exports as csv</string>
+    <string name="licences">開放程式許可</string>
+    <string name="licences_summary">法律聲明許可</string>
+    <string name="version">版本 %s</string>
+    <plurals name="second">
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <string name="info">資料</string>
+    <string name="data">數據</string>
+    <string name="weather">Weather</string>
+    <string name="environment">Environment</string>
+    <string name="wind_speed">Wind speed</string>
+    <string name="wind_direction">Wind direction</string>
+    <string name="sight_setting_removed">Sight setting deleted!</string>
+    <string name="metric">Metric</string>
+    <string name="imperial">Imperial</string>
+    <string name="undo">撤销</string>
+    <string name="standard_rounds">Standard rounds</string>
+    <string name="expand_collapse">Expand/Collapse</string>
+    <string name="new_round_template">New template</string>
+    <string name="arrow_numbers">Arrow numbers</string>
+    <string name="round_removed">Round deleted!</string>
+    <string name="custom_round">Custom round</string>
+    <string name="filter">Filter</string>
+    <string name="club">Club</string>
+    <string name="target">Target</string>
+    <string name="standard_round">Standard round</string>
+    <string name="use_as_template">Use as template?</string>
+    <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
+    <string name="practice">Practice</string>
+    <string name="edit_training">Edit Training</string>
+    <string name="edit_standard_round">Edit Standard Round</string>
+    <plurals name="arrow_deleted">
+        <item quantity="other">%d arrows deleted</item>
+    </plurals>
+    <plurals name="bow_deleted">
+        <item quantity="other">%d bows deleted</item>
+    </plurals>
+    <plurals name="training_deleted">
+        <item quantity="other">%d trainings deleted</item>
+    </plurals>
+    <plurals name="passe_deleted">
+        <item quantity="other">%d ends deleted</item>
+    </plurals>
+    <plurals name="rounds">
+        <item quantity="other">Round %d</item>
+    </plurals>
+    <plurals name="round_selected">
+        <item quantity="other">%d rounds selected</item>
+    </plurals>
+    <plurals name="round_deleted">
+        <item quantity="other">%d rounds deleted</item>
+    </plurals>
+    <string name="date">Date</string>
+    <string name="edit_round">Edit round</string>
+    <string name="draw_weight">Draw weight</string>
+    <string name="sight">Sight</string>
+    <string name="limbs">Limbs</string>
+    <string name="my_bow">My bow</string>
+    <string name="my_arrow">My arrow</string>
+    <string name="tip_weight">Tip weight</string>
+    <string name="arrow_ranking">Arrow ranking</string>
+    <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
+    <string name="display">Display</string>
+    <string name="print">Print</string>
+    <string name="table">Table</string>
+    <string name="comments">Comments</string>
+    <string name="show_points_colored">Show points colored</string>
+    <string name="stabilizer">Stabilizer</string>
+    <string name="clicker">Clicker</string>
+    <string name="arrow_number_x">Arrow number %s</string>
+    <string name="training_with_standard_round">Training with Standard Round</string>
+    <string name="free_training">Free Training</string>
+    <string name="competition">Competition</string>
+    <string name="about">About</string>
+    <string name="general">General</string>
+    <string name="contribute">Contribute</string>
+    <string name="connect">Connect</string>
+    <string name="special_thanks_to">Special thanks to</string>
+    <string name="all_translators">All guys, who helped translating the app!</string>
+    <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
+    <string name="test_beta">Test the latest beta version</string>
+    <string name="join_on_slack">Join us on Slack</string>
+    <string name="share_with_friends">Share with your friends</string>
+    <string name="donate">Donate</string>
+    <string name="donate_via_paypal">Donate via PayPal</string>
+    <string name="translate_crowdin">Translate on Crowdin</string>
+    <string name="network_linkedin">Network on LinkedIn</string>
+    <string name="search">Search</string>
+    <string name="us">US</string>
+    <string name="show_shots_training">Whole training</string>
+    <string name="show_shots_round">Current round</string>
+    <string name="show_shots_end">Current end</string>
+    <string name="profile">Profile</string>
+    <string name="birthday">Birthday</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+    <string name="age">Age</string>
+    <string name="show_signature">Signature</string>
+    <string name="archer">Archer</string>
+    <string name="hits">Hits</string>
+    <string name="misses">Misses</string>
+    <string name="new_end">New end</string>
+    <string name="distribution">Distribution</string>
+    <string name="count">Count</string>
+    <string name="diameter">Diameter</string>
+    <string name="input">Input</string>
+    <string name="target_zoom">Target zoom level</string>
+    <string name="action_pdf">Export as PDF</string>
+    <string name="arrow_diameter_scale">Arrow diameter scale</string>
+    <string name="timestamp">Timestamp</string>
+    <string name="change_target_face">Change target face</string>
+    <string name="your_first_training">Your first training</string>
+    <string name="grouping">Grouping</string>
+    <string name="show_clusters">Clusters</string>
+    <string name="first_training_description">Tap the plus to start a new training.</string>
+    <string name="show_average">Average</string>
+    <string name="show_none">None</string>
+    <string name="left_handed">Left-handed</string>
+    <string name="right_handed">Right-handed</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
+    <string name="backup_now">Backup now</string>
+    <string name="last_backup">Last backup: %s</string>
+    <string name="recent_backups">Recent backups</string>
+    <string name="dialog_restore_title">Revert to previous version</string>
+    <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
+    <string name="backup_details">Backup details</string>
+    <string name="restore">Restore</string>
+    <string name="backup_location">Backup location</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="automatic_backup">Automatic backup</string>
+    <string name="restoring">Restoring backup…</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="delete_failed">Deletion failed</string>
+    <string name="backup_restore_desc">Backup and restore app data</string>
+    <string name="exporting">Exporting…</string>
+    <string name="loading_backups_failed">Loading backups failed!</string>
+    <string name="external_storage">External storage</string>
+    <string name="backup_interval">Backup interval</string>
+    <string name="daily">Daily</string>
+    <string name="weekly">Weekly</string>
+    <string name="monthly">Monthly</string>
+    <string name="connection_failed">Connection failed!</string>
+    <string name="shooting_indoor">Shooting indoor</string>
+    <string name="bow_rest_vertical_position">Vertical position</string>
+    <string name="bow_rest">Rest</string>
+    <string name="bow_rest_horizontal_position">Horizontal position</string>
+    <string name="bow_cam_settings">Cam settings</string>
+    <string name="bow_letoff_weight">Letoff weight</string>
+    <string name="bow_nocking_point">Nocking point</string>
+    <string name="bow_string">String</string>
+    <string name="bow_scope_magnification">Scope magnification</string>
+    <string name="bow_rest_stiffness">Stiffness</string>
+    <string name="bow_button">Button</string>
+    <string name="more_fields">More fields</string>
+    <string name="recently_used">Recently used</string>
+    <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+    <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+    <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+    <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+    <string name="average_arrow_score_per_end">Average arrow score per end</string>
+    <string name="show_end">Show end</string>
+    <string name="show_round">Show round</string>
+    <string name="show_training">Show training</string>
+    <string name="summary">Summary</string>
+    <string name="end">End</string>
+    <string name="average_of">Average of</string>
+    <string name="displayed_shots">Displayed shots</string>
+    <string name="invalid_decimal_number">Invalid decimal number</string>
+    <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
+    <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
+    <string name="next_round">Next round</string>
+    <string name="previous_round">Previous round</string>
+    <string name="overview">Overview</string>
+    <string name="score">Score</string>
+    <string name="show_reached_score">Show reached score</string>
+    <string name="show_total_score">Show total score</string>
+    <string name="show_percentage">Show percentage</string>
+    <string name="show_arrow_average">Show arrow average</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="delete_image">Delete image?</string>
+    <string name="keyboard_type">Keyboard type</string>
+    <string name="keyboard_enabled">Keyboard enabled</string>
+    <string name="sort_shots">Sort shots</string>
+    <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+    <string name="target_captain">Target captain</string>
+    <string name="language">Language</string>
+    <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
+    <string name="drawer_open">Open drawer</string>
+    <string name="drawer_close">Close drawer</string>
+    <string name="help">Help</string>
+    <string name="home">Home</string>
+    <string name="click_to_enter_profile">Click to enter profile information</string>
+    <string name="no_trainings">You don\'t have any trainings, yet!</string>
+    <string name="no_bows">No bows</string>
+    <string name="no_arrows">No arrows</string>
+    <string name="version_info">Version info</string>
+    <string name="version_prefix">Version</string>
+    <string name="max_arrow_number">Maximum arrow number</string>
+    <string name="distances">Distances</string>
+    <string name="diameters">Diameters</string>
+    <string name="bows">Bows</string>
+    <string name="reset">Reset</string>
+    <string name="end_x_of_y">局 %1$d/%2$d</string>
+    <string name="round_x_of_y">輪 %1$d/%2$d</string>
+    <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+    <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
+    <string name="settings_summary_input">Customize input screen</string>
+    <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
+    <string name="settings_summary_profile">Enter personal information</string>
+    <string name="licence_number">Licence number</string>
+    <string name="file_type">File type</string>
+    <string name="clear">Clear</string>
+    <string name="tap_to_sign">Tap to sign</string>
+    <string name="pdf_file">PDF file</string>
+    <string name="image_file">Image file</string>
+    <string name="settings_summary_statistics">Adjust statistics screen</string>
+    <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+    <string name="keep_above_lockscreen">Keep above lockscreen</string>
+    <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc3519401..fd68ea56a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -248,7 +248,7 @@
     <string name="all_translators">All guys, who helped translating the app!</string>
     <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
     <string name="test_beta">Test the latest beta version</string>
-    <string name="join_on_google_plus">Join us on Google+</string>
+    <string name="join_on_slack">Join us on Slack</string>
     <string name="share_with_friends">Share with your friends</string>
     <string name="donate">Donate</string>
     <string name="donate_via_paypal">Donate via PayPal</string>
@@ -391,4 +391,5 @@
     <string name="scoreboard_title_all_rounds">All rounds</string>
     <string name="permission_required">Permission required</string>
     <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
+    <string name="fix_db">Attempt to fix database</string>
 </resources>
diff --git a/app/src/regular/play/en-US/listing/fulldescription b/app/src/regular/play/en-US/listing/fulldescription
index fdeb060c2..a72257188 100644
--- a/app/src/regular/play/en-US/listing/fulldescription
+++ b/app/src/regular/play/en-US/listing/fulldescription
@@ -21,10 +21,13 @@ MyTargets is a free and even open source archery app, which helps you manage you
 The app is already available in over 20 languages. If your language is not yet supported or you spotted some mistakes in your translation, you can easily translate the app yourself on the following website
 https://crowdin.com/project/mytargets
 
-<b>Community and Beta Test</b>
-If you want to participate in discussions regarding the future development of the app, you can join our G+ Community.
-Members of the group also have the option to try out the latest beta versions of the app. Therefore if you can't wait to try out new features this is the place for you :)
-https://plus.google.com/communities/102686119334423317437
+<b>Beta Test</b>
+The app also has a beta track that you can join directly via the play store.
+If you can't wait to try out new features this is the place for you :)
+https://join.slack.com/t/mytargets/shared_invite/enQtNjk2NTE0MzU5NzE0LTc3NjAwYmZiNTcxMDA1NTI0M2UzYWY4ZGQwMjVhYjEyODQ0MDE2MjlhZjZiZTUwODg2YTE5YjhkN2FmZTQ2Njc
+
+<b>Community</b>
+If you want to participate in discussions regarding the future development of the app, you can join our Slack channel.
 
 <b>Problems</b>
 If you find any bugs or you have ideas for new features you can either contact me directly via Mail or use the following ticket tracking system https://github.com/DreierF/MyTargets/issues
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2a2f46fe4..88f2d4873 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
  */
 
 buildscript {
-    ext.kotlinVersion = '1.2.61'
+    ext.kotlinVersion = '1.3.41'
     repositories {
         jcenter()
         google()
@@ -23,19 +23,19 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-rc02'
-        classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.3'
-        classpath 'com.google.gms:google-services:4.0.2'
-        classpath 'com.google.firebase:firebase-plugins:1.1.5'
+        classpath 'com.android.tools.build:gradle:3.5.0-rc01'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6'
+        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'com.google.firebase:firebase-plugins:2.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath 'android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0'
     }
 }
 
 plugins {
     id 'com.mendhak.gradlecrowdin' version '0.1.0'
-    id 'com.github.ben-manes.versions' version '0.19.0'
+    id 'com.github.ben-manes.versions' version '0.21.0'
 }
 
 apply from: 'dependencies.gradle'
@@ -46,11 +46,10 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
         maven { url 'https://clojars.org/repo/' }
-        maven { url 'https://maven.google.com/' }
     }
 }
 
 apply from: 'tools/script-git-version.gradle'
-apply from: 'tools/script-crowdin.gradle'
+apply from: "tools/script-crowdin.gradle"
 apply from: 'tools/script-dependency-updates.gradle'
 apply from: 'tools/script-keystore-fallback.gradle'
diff --git a/buildSrc/buildSrc.iml b/buildSrc/buildSrc.iml
new file mode 100644
index 000000000..2d07a537f
--- /dev/null
+++ b/buildSrc/buildSrc.iml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="buildSrc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/build/classes/java/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/java/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Gradle: gradle-api-5.5.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: groovy-all-1.0-2.5.4" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: kotlin-stdlib-jdk8-1.3.31" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: kotlin-stdlib-1.3.31" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: kotlin-stdlib-common-1.3.31" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: kotlin-stdlib-jdk7-1.3.31" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: kotlin-reflect-1.3.31" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: gradle-installation-beacon-5.5.1" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/debug.keystore b/debug.keystore
new file mode 100644
index 000000000..9558b658c
Binary files /dev/null and b/debug.keystore differ
diff --git a/dependencies.gradle b/dependencies.gradle
index 82388d4f0..03685ba3a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,75 +17,87 @@ ext {
     compileSdkVersionCode = 28
 
     libraryVersion = [
-            aboutPage                 : '1.2.4',
-            androidLanguages          : 'v1.0.1',
-            androidState              : '1.3.1',
-            architectureComponents    : '1.1.1',
-            architectureComponentsRoom: '1.1.1-rc1',
-            crashlytics               : '2.9.4',
-            discreteSeekbar           : '1.0.1',
-            easyImage                 : '2.0.4',
-            espresso                  : '3.0.2',
-            findbugs                  : '3.0.2',
-            gson                      : '2.8.5',
-            homage                    : '0.2.0',
-            iab                       : '1.0.44',
-            jUnit                     : '4.12',
-            materialDialogs           : '0.9.6.0',
-            materialIntroScreen       : '0.0.5',
-            mpAndroidChart            : 'v3.0.3',
-            mockito                   : '2.20.1',
-            multidex                  : '1.0.3',
-            okhttp                    : '3.11.0',
-            permissionsdispatcher     : '3.2.0',
-            photoView                 : '2.1.3',
-            picasso                   : '2.5.2',
-            playService               : '15.0.0',
-            retrofit                  : '2.4.0',
-            roundedImageView          : '2.3.0',
-            screengrab                : '1.2.0',
-            signaturePad              : '1.2.1',
-            support                   : '27.1.1',
-            supportWearable           : '2.3.0',
-            testSupport               : '1.0.2',
-            threeTenABP               : '1.1.0',
-            timber                    : '4.7.1',
-            truth                     : '0.42',
-            uiAutomator               : '2.1.3',
-            versionInfoDialog         : '0.1.0'
+            aboutPage            : '1.2.5',
+            androidLanguages     : 'v1.0.1',
+            androidState         : '1.4.1',
+            discreteSeekbar      : '1.0.1',
+            easyImage            : '2.1.0',
+            espresso             : '3.2.0',
+            gson                 : '2.8.5',
+            homage               : '0.2.0',
+            iab                  : '1.1.0',
+            jUnit                : '4.12',
+            materialDialogs      : '0.9.6.0',
+            materialIntroScreen  : '0.0.6',
+            mpAndroidChart       : 'v3.0.3',
+            mockito              : '2.27.0',
+            multidex             : '2.0.1',
+            okhttp               : '3.11.0',
+            permissionsdispatcher: '4.5.0',
+            photoView            : '2.1.3',
+            picasso              : '2.5.2',
+            playService          : '16.0.1',
+            retrofit             : '2.6.0',
+            roundedImageView     : '2.3.0',
+            screengrab           : '1.2.0',
+            signaturePad         : '1.2.1',
+            testSupport          : '1.2.0',
+            threeTenABP          : '1.2.1',
+            timber               : '4.7.1',
+            truth                : '1.0',
+            uiAutomator          : '2.2.0-alpha1',
+            versionInfoDialog    : '0.1.0'
     ]
 
     dependencies = [
-            supportCompat                 : "com.android.support:support-compat:$libraryVersion.support",
-            supportCoreUtils              : "com.android.support:support-core-utils:$libraryVersion.support",
-            supportCoreUi                 : "com.android.support:support-core-ui:$libraryVersion.support",
-            supportFragment               : "com.android.support:support-fragment:$libraryVersion.support",
-            supportV13                    : "com.android.support:support-v13:$libraryVersion.support",
-            appCompat                     : "com.android.support:appcompat-v7:$libraryVersion.support",
-            supportDesign                 : "com.android.support:design:$libraryVersion.support",
-            supportAnnotations            : "com.android.support:support-annotations:$libraryVersion.support",
-            supportPreference             : "com.android.support:preference-v14:$libraryVersion.support",
-            recyclerView                  : "com.android.support:recyclerview-v7:$libraryVersion.support",
-            cardView                      : "com.android.support:cardview-v7:$libraryVersion.support",
-            supportV4                     : "com.android.support:support-v4:$libraryVersion.support",
-            supportExifInterface          : "com.android.support:exifinterface:$libraryVersion.support",
-            supportMediaCompat            : "com.android.support:support-media-compat:$libraryVersion.support",
-            supportWear                   : "com.android.support:wear:$libraryVersion.support",
-            supportWearable               : "com.google.android.support:wearable:$libraryVersion.supportWearable",
-            wearable                      : "com.google.android.wearable:wearable:$libraryVersion.supportWearable",
-
-//            androidxCoreKtx               : 'androidx.core:core-ktx:0.3',
-
-            archLifecycleExtensions       : "android.arch.lifecycle:extensions:$libraryVersion.architectureComponents",
-            archLifecycleCompiler         : "android.arch.lifecycle:compiler:$libraryVersion.architectureComponents",
-            archRoomRuntime               : "android.arch.persistence.room:runtime:$libraryVersion.architectureComponentsRoom",
-            archRoomCompiler              : "android.arch.persistence.room:compiler:$libraryVersion.architectureComponentsRoom",
-            archRoomTesting               : "android.arch.persistence.room:testing:$libraryVersion.architectureComponentsRoom",
-
-            playServicesDrive             : "com.google.android.gms:play-services-drive:$libraryVersion.playService",
-            playServicesWearable          : "com.google.android.gms:play-services-wearable:$libraryVersion.playService",
-            firebaseCore                  : "com.google.firebase:firebase-core:$libraryVersion.playService",
-            firebaseCrashlytics           : "com.crashlytics.sdk.android:crashlytics:$libraryVersion.crashlytics@aar",
+            androidxAnnotations           : 'androidx.annotation:annotation:1.0.2',
+            androidxCore                  : 'androidx.core:core:1.0.2',
+            androidxCoreUtils             : 'androidx.legacy:legacy-support-core-utils:1.0.0',
+            androidxCoreUi                : 'androidx.legacy:legacy-support-core-ui:1.0.0',
+            androidxFragment              : 'androidx.fragment:fragment:1.0.0',
+            androidxV13                   : 'androidx.legacy:legacy-support-v13:1.0.0',
+            appCompat                     : 'androidx.appcompat:appcompat:1.0.2',
+            androidxDesign                : 'com.google.android.material:material:1.0.0',
+            androidxPreference            : 'androidx.legacy:legacy-preference-v14:1.0.0',
+            recyclerView                  : 'androidx.recyclerview:recyclerview:1.0.0',
+            cardView                      : 'androidx.cardview:cardview:1.0.0',
+            androidxV4                    : 'androidx.legacy:legacy-support-v4:1.0.0',
+            androidxExifInterface         : 'androidx.exifinterface:exifinterface:1.0.0',
+            androidxMediaCompat           : 'androidx.media:media:1.0.1',
+
+            androidxTestCore              : 'androidx.test:core:1.0.0',
+            androidxTestExt               : 'androidx.test.ext:junit:1.1.1',
+            androidxTestTruth             : 'androidx.test.ext:truth:1.2.0',
+            androidTestOrchestrator       : 'androidx.test:orchestrator:1.1.0',
+
+            supportDesign                 : 'com.android.support:design:28.0.0',
+
+            androidxCoreKtx               : 'androidx.core:core-ktx:1.0.2',
+            androidFragmentKtx            : 'androidx.fragment:fragment-ktx:1.0.0',
+
+            androidxWear                  : 'androidx.wear:wear:1.0.0',
+            androidxWearable              : 'com.google.android.support:wearable:2.4.0',
+            wearable                      : 'com.google.android.wearable:wearable:2.4.0',
+
+            archLifecycleExtensions       : 'androidx.lifecycle:lifecycle-extensions:2.0.0',
+            archLifecycleCompiler         : 'androidx.lifecycle:lifecycle-compiler:2.0.0',
+
+            archRoomRuntime               : 'androidx.room:room-runtime:2.1.0',
+            archRoomCompiler              : 'androidx.room:room-compiler:2.1.0',
+            archRoomTesting               : 'androidx.room:room-testing:2.1.0',
+
+            archNavigationFragment        : 'android.arch.navigation:navigation-fragment-ktx:1.0.0',
+            archNavigationUi              : 'android.arch.navigation:navigation-ui-ktx:1.0.0',
+
+            playServicesAuth              : "com.google.android.gms:play-services-auth:17.0.0",
+            playServicesWearable          : "com.google.android.gms:play-services-wearable:17.0.0",
+
+            googleHttpClientAuth          : 'com.google.http-client:google-http-client-gson:1.30.2',
+            googleApiClientAndroid        : 'com.google.api-client:google-api-client-android:1.30.2',
+            googleApiServicesDrive        : 'com.google.apis:google-api-services-drive:v3-rev20190416-1.28.0',
+
+            firebaseCore                  : 'com.google.firebase:firebase-core:16.0.8',
+            firebaseCrashlytics           : 'com.crashlytics.sdk.android:crashlytics:2.10.1',
 
             gson                          : "com.google.code.gson:gson:$libraryVersion.gson",
 
@@ -100,8 +112,8 @@ ext {
             androidState                  : "com.evernote:android-state:$libraryVersion.androidState",
             androidStateProcessor         : "com.evernote:android-state-processor:$libraryVersion.androidState",
 
-            permissionsDispatcher         : "com.github.hotchemi:permissionsdispatcher:$libraryVersion.permissionsdispatcher",
-            permissionsDispatcherProcessor: "com.github.hotchemi:permissionsdispatcher-processor:$libraryVersion.permissionsdispatcher",
+            permissionsDispatcher         : "org.permissionsdispatcher:permissionsdispatcher:$libraryVersion.permissionsdispatcher",
+            permissionsDispatcherProcessor: "org.permissionsdispatcher:permissionsdispatcher-processor:$libraryVersion.permissionsdispatcher",
 
             iab                           : "com.anjlab.android.iab.v3:library:$libraryVersion.iab",
 
@@ -120,7 +132,7 @@ ext {
 
             roundedImageView              : "com.makeramen:roundedimageview:$libraryVersion.roundedImageView",
 
-            materialIntroScreen           : "agency.tango.android:material-intro-screen:$libraryVersion.materialIntroScreen",
+            materialIntroScreen           : "io.github.dreierf:material-intro-screen:$libraryVersion.materialIntroScreen",
 
             dbFlowProcessor               : "com.github.Raizlabs.DBFlow:dbflow-processor:$libraryVersion.dbFlow",
             dbFlowKotlinExtensions        : "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:$libraryVersion.dbFlow",
@@ -136,25 +148,24 @@ ext {
             signaturePad                  : "com.github.gcacace:signature-pad:$libraryVersion.signaturePad",
 
             truth                         : "com.google.truth:truth:$libraryVersion.truth",
-            jsr305                        : "com.google.code.findbugs:jsr305:$libraryVersion.findbugs",
-            runner                        : "com.android.support.test:runner:$libraryVersion.testSupport",
-            rules                         : "com.android.support.test:rules:$libraryVersion.testSupport",
-            uiAutomator                   : "com.android.support.test.uiautomator:uiautomator-v18:$libraryVersion.uiAutomator",
+            runner                        : "androidx.test:runner:$libraryVersion.testSupport",
+            rules                         : "androidx.test:rules:$libraryVersion.testSupport",
+            uiAutomator                   : "androidx.test.uiautomator:uiautomator-v18:$libraryVersion.uiAutomator",
             jUnit                         : "junit:junit:$libraryVersion.jUnit",
             mockito                       : "org.mockito:mockito-core:$libraryVersion.mockito",
 
-            espressoCore                  : "com.android.support.test.espresso:espresso-core:$libraryVersion.espresso",
-            espressoContrib               : "com.android.support.test.espresso:espresso-contrib:$libraryVersion.espresso",
-            espressoIntents               : "com.android.support.test.espresso:espresso-intents:$libraryVersion.espresso",
-            espressoIdlingResource        : "com.android.support.test.espresso:espresso-idling-resource:$libraryVersion.espresso",
+            espressoCore                  : "androidx.test.espresso:espresso-core:$libraryVersion.espresso",
+            espressoContrib               : "androidx.test.espresso:espresso-contrib:$libraryVersion.espresso",
+            espressoIntents               : "androidx.test.espresso:espresso-intents:$libraryVersion.espresso",
+            espressoIdlingResource        : "androidx.test.espresso:espresso-idling-resource:$libraryVersion.espresso",
 
-            screengrab                    : "tools.fastlane:screengrab:$libraryVersion.screengrab",
+            screengrab                    : 'tools.fastlane:screengrab:1.2.0',
 
             kotlinStdlibJdk7              : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion",
             kotlinTest                    : "org.jetbrains.kotlin:kotlin-test:$kotlinVersion",
             kotlinTestJunit               : "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion",
 
-            multiDex                      : "com.android.support:multidex:$libraryVersion.multidex",
+            multiDex                      : "androidx.multidex:multidex:$libraryVersion.multidex",
 
             threeTenABP                   : "com.jakewharton.threetenabp:threetenabp:$libraryVersion.threeTenABP",
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..58d9e31a4
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,4 @@
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+#kapt.incremental.apt=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a8..87b738cbd 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 662331454..430dfabc5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Aug 01 20:01:51 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/gradlew b/gradlew
index 91a7e269e..af6708ff2 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282aa..0f8d5937c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/shared/build.gradle b/shared/build.gradle
index 8cab8d708..3ffffd016 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary true
     }
 
@@ -46,23 +46,24 @@ android {
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
 
-    api dependencies.supportV4
-    api dependencies.supportFragment
-    api dependencies.supportCoreUi
-    api dependencies.supportCoreUtils
-    api dependencies.supportMediaCompat
-    api dependencies.supportAnnotations
+    api dependencies.androidxV4
+    api dependencies.androidxFragment
+    api dependencies.androidxCoreUi
+    api dependencies.androidxCoreUtils
+    api dependencies.androidxMediaCompat
+    api dependencies.androidxAnnotations
     api dependencies.threeTenABP
+    api dependencies.playServicesWearable
+    implementation dependencies.timber
+
+    implementation dependencies.archLifecycleExtensions
 
-    implementation dependencies.archRoomRuntime
-//    implementation dependencies.androidxCoreKtx
+    api dependencies.archRoomRuntime
+    implementation dependencies.androidxCoreKtx
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
 
-    api dependencies.playServicesWearable
-    api dependencies.timber
-
     testImplementation dependencies.jUnit
     testImplementation dependencies.mockito
     testImplementation dependencies.truth
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
index ec84ce659..f90e2357b 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
 import org.junit.Assert
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
index f2ace9892..2e6c64726 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.targets.TargetFactory
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
index 105e57c75..523ddc941 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
 import org.junit.Assert
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt
index a07cd53ca..8e26d1a37 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
 import org.junit.Assert
diff --git a/shared/src/main/java/androidx/core/animation/Animator.kt b/shared/src/main/java/androidx/core/animation/Animator.kt
deleted file mode 100644
index 30f0a51b4..000000000
--- a/shared/src/main/java/androidx/core/animation/Animator.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package androidx.core.animation
-
-import android.animation.Animator
-
-/**
- * Add a listener to this Animator using the provided actions.
- */
-fun Animator.addListener(
-    onEnd: ((animator: Animator) -> Unit)? = null,
-    onStart: ((animator: Animator) -> Unit)? = null,
-    onCancel: ((animator: Animator) -> Unit)? = null,
-    onRepeat: ((animator: Animator) -> Unit)? = null
-): Animator.AnimatorListener {
-    val listener = object : Animator.AnimatorListener {
-        override fun onAnimationRepeat(animator: Animator) {
-            onRepeat?.invoke(animator)
-        }
-
-        override fun onAnimationEnd(animator: Animator) {
-            onEnd?.invoke(animator)
-        }
-
-        override fun onAnimationCancel(animator: Animator) {
-            onCancel?.invoke(animator)
-        }
-
-        override fun onAnimationStart(animator: Animator) {
-            onStart?.invoke(animator)
-        }
-    }
-    addListener(listener)
-    return listener
-}
diff --git a/shared/src/main/java/androidx/core/content/Context.kt b/shared/src/main/java/androidx/core/content/Context.kt
deleted file mode 100644
index 41d8fc8a5..000000000
--- a/shared/src/main/java/androidx/core/content/Context.kt
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package androidx.core.content
-
-import android.accessibilityservice.AccessibilityService
-import android.accounts.AccountManager
-import android.app.*
-import android.app.admin.DevicePolicyManager
-import android.app.job.JobScheduler
-import android.app.usage.UsageStatsManager
-import android.appwidget.AppWidgetManager
-import android.bluetooth.BluetoothManager
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.RestrictionsManager
-import android.content.pm.LauncherApps
-import android.hardware.ConsumerIrManager
-import android.hardware.SensorManager
-import android.hardware.camera2.CameraManager
-import android.hardware.display.DisplayManager
-import android.hardware.input.InputManager
-import android.hardware.usb.UsbManager
-import android.location.LocationManager
-import android.media.AudioManager
-import android.media.MediaRouter
-import android.media.projection.MediaProjectionManager
-import android.media.session.MediaSessionManager
-import android.media.tv.TvInputManager
-import android.net.ConnectivityManager
-import android.net.nsd.NsdManager
-import android.net.wifi.WifiManager
-import android.net.wifi.p2p.WifiP2pManager
-import android.nfc.NfcManager
-import android.os.*
-import android.os.storage.StorageManager
-import android.print.PrintManager
-import android.telecom.TelecomManager
-import android.telephony.SubscriptionManager
-import android.telephony.TelephonyManager
-import android.view.LayoutInflater
-import android.view.WindowManager
-import android.view.accessibility.CaptioningManager
-import android.view.inputmethod.InputMethodManager
-import android.view.textservice.TextServicesManager
-import java.util.*
-
-inline fun <reified T> Context.systemService(): T = getSystemService(this, T::class.java)!!
-
-val ACCESSIBILITY_SERVICE = "accessibility"
-val ACCOUNT_SERVICE = "account"
-val ACTIVITY_SERVICE = "activity"
-val ALARM_SERVICE = "alarm"
-val APPWIDGET_SERVICE = "appwidget"
-val APP_OPS_SERVICE = "appops"
-val AUDIO_SERVICE = "audio"
-val BATTERY_SERVICE = "batterymanager"
-val BLUETOOTH_SERVICE = "bluetooth"
-val CAMERA_SERVICE = "camera"
-val CAPTIONING_SERVICE = "captioning"
-val CARRIER_CONFIG_SERVICE = "carrier_config"
-val CLIPBOARD_SERVICE = "clipboard"
-val COMPANION_DEVICE_SERVICE = "companiondevice"
-val CONNECTIVITY_SERVICE = "connectivity"
-val CONSUMER_IR_SERVICE = "consumer_ir"
-val CONTEXT_IGNORE_SECURITY = 2
-val CONTEXT_INCLUDE_CODE = 1
-val CONTEXT_RESTRICTED = 4
-val CROSS_PROFILE_APPS_SERVICE = "crossprofileapps"
-val DEVICE_POLICY_SERVICE = "device_policy"
-val DISPLAY_SERVICE = "display"
-val DOWNLOAD_SERVICE = "download"
-val DROPBOX_SERVICE = "dropbox"
-val EUICC_SERVICE = "euicc"
-val FINGERPRINT_SERVICE = "fingerprint"
-val HARDWARE_PROPERTIES_SERVICE = "hardware_properties"
-val INPUT_METHOD_SERVICE = "input_method"
-val INPUT_SERVICE = "input"
-val IPSEC_SERVICE = "ipsec"
-val JOB_SCHEDULER_SERVICE = "jobscheduler"
-val KEYGUARD_SERVICE = "keyguard"
-val LAUNCHER_APPS_SERVICE = "launcherapps"
-val LAYOUT_INFLATER_SERVICE = "layout_inflater"
-val LOCATION_SERVICE = "location"
-val MEDIA_PROJECTION_SERVICE = "media_projection"
-val MEDIA_ROUTER_SERVICE = "media_router"
-val MEDIA_SESSION_SERVICE = "media_session"
-val MIDI_SERVICE = "midi"
-val NETWORK_STATS_SERVICE = "netstats"
-val NFC_SERVICE = "nfc"
-val NOTIFICATION_SERVICE = "notification"
-val NSD_SERVICE = "servicediscovery"
-val POWER_SERVICE = "power"
-val PRINT_SERVICE = "print"
-val RESTRICTIONS_SERVICE = "restrictions"
-val SEARCH_SERVICE = "search"
-val SENSOR_SERVICE = "sensor"
-val SHORTCUT_SERVICE = "shortcut"
-val STORAGE_SERVICE = "storage"
-val STORAGE_STATS_SERVICE = "storagestats"
-val SYSTEM_HEALTH_SERVICE = "systemhealth"
-val TELECOM_SERVICE = "telecom"
-val TELEPHONY_SERVICE = "phone"
-val TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service"
-val TEXT_CLASSIFICATION_SERVICE = "textclassification"
-val TEXT_SERVICES_MANAGER_SERVICE = "textservices"
-val TV_INPUT_SERVICE = "tv_input"
-val UI_MODE_SERVICE = "uimode"
-val USAGE_STATS_SERVICE = "usagestats"
-val USB_SERVICE = "usb"
-val USER_SERVICE = "user"
-val VIBRATOR_SERVICE = "vibrator"
-val WALLPAPER_SERVICE = "wallpaper"
-val WIFI_AWARE_SERVICE = "wifiaware"
-val WIFI_P2P_SERVICE = "wifip2p"
-val WIFI_RTT_RANGING_SERVICE = "wifirtt"
-val WIFI_SERVICE = "wifi"
-val WINDOW_SERVICE = "window"
-/**
- * Return the handle to a system-level service by class.
- *
- * @param context Context to retrieve service from.
- * @param serviceClass The class of the desired service.
- * @return The service or null if the class is not a supported system service.
- *
- * @see Context.getSystemService
- */
-fun <T> getSystemService(context: Context, serviceClass: Class<T>): T? {
-    if (Build.VERSION.SDK_INT >= 23) {
-        return context.getSystemService(serviceClass)
-    }
-
-    val serviceName = getSystemServiceName(context, serviceClass)
-    return if (serviceName != null) context.getSystemService(serviceName) as T else null
-}
-
-/**
- * Gets the name of the system-level service that is represented by the specified class.
- *
- * @param context Context to retrieve service name from.
- * @param serviceClass The class of the desired service.
- * @return The service name or null if the class is not a supported system service.
- *
- * @see Context.getSystemServiceName
- */
-fun getSystemServiceName(
-    context: Context,
-    serviceClass: Class<*>
-): String? {
-    return if (Build.VERSION.SDK_INT >= 23) {
-        context.getSystemServiceName(serviceClass)
-    } else LegacyServiceMapHolder.SERVICES[serviceClass]
-}
-
-/** Nested class provides lazy initialization only when needed.  */
-private object LegacyServiceMapHolder {
-    internal val SERVICES = HashMap<Class<*>, String>()
-
-    init {
-        if (Build.VERSION.SDK_INT > 22) {
-            SERVICES[SubscriptionManager::class.java] = TELEPHONY_SUBSCRIPTION_SERVICE
-            SERVICES[UsageStatsManager::class.java] = USAGE_STATS_SERVICE
-        }
-        if (Build.VERSION.SDK_INT > 21) {
-            SERVICES[AppWidgetManager::class.java] = APPWIDGET_SERVICE
-            SERVICES[BatteryManager::class.java] = BATTERY_SERVICE
-            SERVICES[CameraManager::class.java] = CAMERA_SERVICE
-            SERVICES[JobScheduler::class.java] = JOB_SCHEDULER_SERVICE
-            SERVICES[LauncherApps::class.java] = LAUNCHER_APPS_SERVICE
-            SERVICES[MediaProjectionManager::class.java] = MEDIA_PROJECTION_SERVICE
-            SERVICES[MediaSessionManager::class.java] = MEDIA_SESSION_SERVICE
-            SERVICES[RestrictionsManager::class.java] = RESTRICTIONS_SERVICE
-            SERVICES[TelecomManager::class.java] = TELECOM_SERVICE
-            SERVICES[TvInputManager::class.java] = TV_INPUT_SERVICE
-        }
-        if (Build.VERSION.SDK_INT > 19) {
-            SERVICES[AppOpsManager::class.java] = APP_OPS_SERVICE
-            SERVICES[CaptioningManager::class.java] = CAPTIONING_SERVICE
-            SERVICES[ConsumerIrManager::class.java] = CONSUMER_IR_SERVICE
-            SERVICES[PrintManager::class.java] = PRINT_SERVICE
-        }
-        if (Build.VERSION.SDK_INT > 18) {
-            SERVICES[BluetoothManager::class.java] = BLUETOOTH_SERVICE
-        }
-        if (Build.VERSION.SDK_INT > 17) {
-            SERVICES[DisplayManager::class.java] = DISPLAY_SERVICE
-            SERVICES[UserManager::class.java] = USER_SERVICE
-        }
-        if (Build.VERSION.SDK_INT > 16) {
-            SERVICES[InputManager::class.java] = INPUT_SERVICE
-            SERVICES[MediaRouter::class.java] = MEDIA_ROUTER_SERVICE
-            SERVICES[NsdManager::class.java] = NSD_SERVICE
-        }
-        SERVICES[AccessibilityService::class.java] = ACCESSIBILITY_SERVICE
-        SERVICES[AccountManager::class.java] = ACCOUNT_SERVICE
-        SERVICES[ActivityManager::class.java] = ACTIVITY_SERVICE
-        SERVICES[AlarmManager::class.java] = ALARM_SERVICE
-        SERVICES[AudioManager::class.java] = AUDIO_SERVICE
-        SERVICES[ClipboardManager::class.java] = CLIPBOARD_SERVICE
-        SERVICES[ConnectivityManager::class.java] = CONNECTIVITY_SERVICE
-        SERVICES[DevicePolicyManager::class.java] = DEVICE_POLICY_SERVICE
-        SERVICES[DownloadManager::class.java] = DOWNLOAD_SERVICE
-        SERVICES[DropBoxManager::class.java] = DROPBOX_SERVICE
-        SERVICES[InputMethodManager::class.java] = INPUT_METHOD_SERVICE
-        SERVICES[KeyguardManager::class.java] = KEYGUARD_SERVICE
-        SERVICES[LayoutInflater::class.java] = LAYOUT_INFLATER_SERVICE
-        SERVICES[LocationManager::class.java] = LOCATION_SERVICE
-        SERVICES[NfcManager::class.java] = NFC_SERVICE
-        SERVICES[NotificationManager::class.java] = NOTIFICATION_SERVICE
-        SERVICES[PowerManager::class.java] = POWER_SERVICE
-        SERVICES[SearchManager::class.java] = SEARCH_SERVICE
-        SERVICES[SensorManager::class.java] = SENSOR_SERVICE
-        SERVICES[StorageManager::class.java] = STORAGE_SERVICE
-        SERVICES[TelephonyManager::class.java] = TELEPHONY_SERVICE
-        SERVICES[TextServicesManager::class.java] = TEXT_SERVICES_MANAGER_SERVICE
-        SERVICES[UiModeManager::class.java] = UI_MODE_SERVICE
-        SERVICES[UsbManager::class.java] = USB_SERVICE
-        SERVICES[Vibrator::class.java] = VIBRATOR_SERVICE
-        SERVICES[WallpaperManager::class.java] = WALLPAPER_SERVICE
-        SERVICES[WifiP2pManager::class.java] = WIFI_P2P_SERVICE
-        SERVICES[WifiManager::class.java] = WIFI_SERVICE
-        SERVICES[WindowManager::class.java] = WINDOW_SERVICE
-    }
-}
diff --git a/shared/src/main/java/androidx/core/graphics/Rect.kt b/shared/src/main/java/androidx/core/graphics/Rect.kt
deleted file mode 100644
index 07c75d62f..000000000
--- a/shared/src/main/java/androidx/core/graphics/Rect.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package androidx.core.graphics
-
-import android.graphics.Rect
-import android.graphics.RectF
-
-/**
- * Returns a [Rect] representation of this rectangle. The resulting rect will be sized such
- * that this rect can fit within it.
- */
-inline fun RectF.toRect(): Rect {
-    val r = Rect()
-    roundOut(r)
-    return r
-}
\ No newline at end of file
diff --git a/shared/src/main/java/androidx/core/net/Uri.kt b/shared/src/main/java/androidx/core/net/Uri.kt
deleted file mode 100644
index 2e9b90274..000000000
--- a/shared/src/main/java/androidx/core/net/Uri.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package androidx.core.net
-
-import android.net.Uri
-
-/**
- * Creates a Uri from the given encoded URI string.
- *
- * @see Uri.parse
- */
-inline fun String.toUri(): Uri = Uri.parse(this)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
index 8339ba473..983fcf32b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
@@ -18,9 +18,8 @@ package de.dreier.mytargets.shared
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
-import android.os.StrictMode
 import android.preference.PreferenceManager
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import com.jakewharton.threetenabp.AndroidThreeTen
 import timber.log.Timber
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
index 10d8a7b3d..3083ce7e9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.analysis.aggregation
 
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 
 import de.dreier.mytargets.shared.targets.drawable.CanvasWrapper
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
index 865741c94..486606f1a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.analysis.aggregation
 
-import android.support.annotation.UiThread
+import androidx.annotation.UiThread
 
 import de.dreier.mytargets.shared.models.db.Shot
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
index 4e5742b27..a46d948b6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.analysis.aggregation
 
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 
 import de.dreier.mytargets.shared.targets.drawable.CanvasWrapper
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
index 30bab1001..0d72daf32 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
@@ -16,8 +16,8 @@
 package de.dreier.mytargets.shared.analysis.aggregation.cluster
 
 import android.os.AsyncTask
-import android.support.annotation.CallSuper
-import android.support.annotation.WorkerThread
+import androidx.annotation.CallSuper
+import androidx.annotation.WorkerThread
 
 import de.dreier.mytargets.shared.analysis.aggregation.IAggregationResultRenderer
 import de.dreier.mytargets.shared.analysis.aggregation.IAggregationStrategy
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
index 53f5d2879..3d9d5a6cf 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.base.fragment
 
-import android.support.annotation.ColorRes
+import androidx.annotation.ColorRes
 
 import de.dreier.mytargets.shared.R
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
index a3c4f38b1..a1adc2411 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.shared.base.fragment
 
 import android.app.Activity
-import android.app.Fragment
 import android.content.Context
 import android.media.MediaPlayer
 import android.os.Bundle
@@ -24,7 +23,8 @@ import android.os.CountDownTimer
 import android.os.Vibrator
 import android.view.View
 import android.view.WindowManager
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
+import androidx.fragment.app.Fragment
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.base.fragment.ETimerState.*
 import de.dreier.mytargets.shared.models.TimerSettings
@@ -51,13 +51,13 @@ abstract class TimerFragmentBase : Fragment(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        settings = arguments.getParcelable(ARG_TIMER_SETTINGS)!!
-        exitAfterStop = arguments.getBoolean(ARG_EXIT_AFTER_STOP)
+        settings = arguments!!.getParcelable(ARG_TIMER_SETTINGS)!!
+        exitAfterStop = arguments!!.getBoolean(ARG_EXIT_AFTER_STOP)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        activity!!.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -107,10 +107,10 @@ abstract class TimerFragmentBase : Fragment(), View.OnClickListener {
                 applyTime("")
             } else {
                 val offset = getOffset(status)
-                countdown = object : CountDownTimer((getDuration(status) * 1000).toLong(), 100) {
+                countdown = object : CountDownTimer((getDuration(status) * 1000).toLong(), 1000) {
                     override fun onTick(millisUntilFinished: Long) {
-                        val text = (millisUntilFinished / 1000 + offset).toString()
-                        applyTime(text)
+                        val countdown = offset + Math.ceil(millisUntilFinished / 1000.0).toInt()
+                        applyTime(countdown.toString())
                     }
 
                     override fun onFinish() {
@@ -145,7 +145,7 @@ abstract class TimerFragmentBase : Fragment(), View.OnClickListener {
             }
             if (settings.vibrate) {
                 val pattern = LongArray(1 + n * 2)
-                val v = activity.systemService<Vibrator>()
+                val v = activity!!.getSystemService<Vibrator>()!!
                 pattern[0] = 150
                 for (i in 0 until n) {
                     pattern[i * 2 + 1] = 400
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
index 809b6a786..2a6ed666b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.support.annotation.DrawableRes
-import android.support.annotation.StringRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
index 2605eea4b..99d758f51 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.R
 
 import de.dreier.mytargets.shared.SharedApplicationInstance
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
index d3adc390f..6231cd606 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
@@ -14,8 +14,8 @@
  */
 package de.dreier.mytargets.shared.models
 
-import android.support.annotation.DrawableRes
-import android.support.annotation.StringRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index 13d9198f6..a6f701ac6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Ignore
+import androidx.room.ColumnInfo
+import androidx.room.Ignore
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.TargetFactory
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
index d898d8f8a..98c72fc5d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
@@ -21,7 +21,7 @@ import android.graphics.BitmapFactory
 import android.graphics.drawable.Drawable
 import android.media.ThumbnailUtils
 import android.os.Parcelable
-import android.support.annotation.DrawableRes
+import androidx.annotation.DrawableRes
 import de.dreier.mytargets.shared.utils.RoundedAvatarDrawable
 import de.dreier.mytargets.shared.utils.toByteArray
 import kotlinx.android.parcel.IgnoredOnParcel
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 48635eff7..f2db44ed3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 85a820695..2cf2595ee 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index ba2e0e3b4..f0c8f759e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.IIdSettable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index df0225f2d..8bb4235b1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 742c5a4a9..1a824c7a8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.*
-import android.arch.persistence.room.ForeignKey.CASCADE
+import androidx.room.*
+import androidx.room.ForeignKey.CASCADE
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index bb843df54..c570c2488 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 995fed98f..355b06945 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.*
-import android.arch.persistence.room.ForeignKey.CASCADE
+import androidx.room.*
+import androidx.room.ForeignKey.CASCADE
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index 4475e6d39..010c2acbf 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.*
-import android.arch.persistence.room.ForeignKey.CASCADE
+import androidx.room.*
+import androidx.room.ForeignKey.CASCADE
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index cbcee2428..67eebbffb 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -15,11 +15,11 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 7b48b482b..421919622 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -14,11 +14,11 @@
  */
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index 7e9e2d58e..3430fc801 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.graphics.Bitmap
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index 66a26b263..e235bca07 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -14,8 +14,8 @@
  */
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 import kotlinx.android.parcel.Parcelize
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index eb59a1104..a79c0bd52 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -15,8 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.*
-import android.arch.persistence.room.ForeignKey.SET_NULL
+import androidx.room.*
+import androidx.room.ForeignKey.SET_NULL
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.IIdSettable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
index 91eb0fef6..7ce04c7a1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
@@ -14,7 +14,7 @@
  */
 package de.dreier.mytargets.shared.targets
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.models.Diameter
 import de.dreier.mytargets.shared.models.ETargetType
 import de.dreier.mytargets.shared.targets.models.TargetModelBase
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
index a9ec4a1f8..2e7beaa42 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.targets.drawable
 
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 import de.dreier.mytargets.shared.analysis.aggregation.EAggregationStrategy
 import de.dreier.mytargets.shared.analysis.aggregation.EAggregationStrategy.NONE
 import de.dreier.mytargets.shared.analysis.aggregation.IAggregationStrategy
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
index 3441ff2f9..ee91b1696 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.shared.targets.models
 
 import android.graphics.PointF
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.ETargetType
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
index 2757f1588..9ea33e733 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.targets.scoringstyle
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.db.Shot
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
index ef304d1b5..fdf141f1f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.targets.scoringstyle
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.db.Shot
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
index 69387c9a1..7fd3d4642 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.shared.utils
 
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 
 object Color {
     @ColorInt
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index c22b6ea11..408f2bd09 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -27,11 +27,11 @@ import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.VisibleForTesting
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.ViewCompat
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat
-import android.support.v4.widget.ExploreByTouchHelper
+import androidx.annotation.VisibleForTesting
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import androidx.customview.widget.ExploreByTouchHelper
 import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.MotionEvent
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
index fa47fffc3..57154b337 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
@@ -19,7 +19,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.gms.wearable.Node
 import com.google.android.gms.wearable.Wearable
 import de.dreier.mytargets.shared.models.TimerSettings
diff --git a/shared/src/main/res/values-af/rounds.xml b/shared/src/main/res/values-af/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-af/rounds.xml
+++ b/shared/src/main/res/values-af/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-af/strings.xml b/shared/src/main/res/values-af/strings.xml
index 7b8c04ef1..a07db414a 100644
--- a/shared/src/main/res/values-af/strings.xml
+++ b/shared/src/main/res/values-af/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-af/target_faces.xml b/shared/src/main/res/values-af/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-af/target_faces.xml
+++ b/shared/src/main/res/values-af/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ar/rounds.xml b/shared/src/main/res/values-ar/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-ar/rounds.xml
+++ b/shared/src/main/res/values-ar/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ar/strings.xml b/shared/src/main/res/values-ar/strings.xml
index 6e9e3afd0..9ee7ac8a0 100644
--- a/shared/src/main/res/values-ar/strings.xml
+++ b/shared/src/main/res/values-ar/strings.xml
@@ -15,72 +15,72 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="zero">%d rounds</item>
-    <item quantity="one">%d round</item>
-    <item quantity="two">%d rounds</item>
-    <item quantity="few">%d rounds</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="zero">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="two">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="few">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="zero">%d arrows per end</item>
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="two">%d arrows per end</item>
-    <item quantity="few">%d arrows per end</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="zero">%d rounds</item>
+        <item quantity="one">%d round</item>
+        <item quantity="two">%d rounds</item>
+        <item quantity="few">%d rounds</item>
+        <item quantity="many">%d rounds</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="zero">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="two">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="few">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="zero">%d arrows per end</item>
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="two">%d arrows per end</item>
+        <item quantity="few">%d arrows per end</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ar/target_faces.xml b/shared/src/main/res/values-ar/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-ar/target_faces.xml
+++ b/shared/src/main/res/values-ar/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ca/rounds.xml b/shared/src/main/res/values-ca/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-ca/rounds.xml
+++ b/shared/src/main/res/values-ca/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ca/strings.xml b/shared/src/main/res/values-ca/strings.xml
index c05a95497..1faece9fa 100644
--- a/shared/src/main/res/values-ca/strings.xml
+++ b/shared/src/main/res/values-ca/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arc recorbat</string>
-  <string name="compound_bow">Arc compost</string>
-  <string name="bare_bow">Arc nu</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Arc recorbat</string>
+    <string name="compound_bow">Arc compost</string>
+    <string name="bare_bow">Arc nu</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ca/target_faces.xml b/shared/src/main/res/values-ca/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-ca/target_faces.xml
+++ b/shared/src/main/res/values-ca/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-cs/rounds.xml b/shared/src/main/res/values-cs/rounds.xml
index b60c67436..81dfdc242 100644
--- a/shared/src/main/res/values-cs/rounds.xml
+++ b/shared/src/main/res/values-cs/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA Trojičky</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA kombinované</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Hala: Dospělý/Mládež</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Hala: Děti</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Děti</string>
-  <string name="flint_bowman_indoor">Flint Bowman Hala</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA individuální eliminace kladkových luků 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA individuální eliminace kladkových luků 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA individuální eliminace kladkových luků 50m</string>
-  <string name="wa_recurve_elimination_18">WA eliminace reflexní luky 18m</string>
-  <string name="wa_recurve_elimination_50">WA eliminace reflexní luky 50m</string>
-  <string name="wa_recurve_elimination_60">WA eliminace reflexní luky 60m</string>
-  <string name="wa_recurve_elimination_70">WA eliminace reflexní luky 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA kladkové kvalifikace</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Krátké</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Děti</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junioři/mládež</string>
-  <string name="nfaa_600_cub">NFAA 600: Děti</string>
-  <string name="nfaa_600_junior">NFAA 600: Junioři/mládež</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Děti</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Teréní 12 neznámé/12 známé: Červený Kolík</string>
-  <string name="wa_field_marked_12_red">WA Teréní známé 12: Červený Kolík</string>
-  <string name="wa_field_marked_24_red">WA Teréní známé 24: Červený Kolík</string>
-  <string name="wa_field_unmarked_12_red">WA Teréní neznámé 12: Červený Kolík</string>
-  <string name="wa_field_unmarked_24_red">WA Teréní neznámé 24: Červený Kolík</string>
-  <string name="wa_field_unmarked_marked_blue">WA Teréní 12 neznámé/12 známé: Modrý Kolík</string>
-  <string name="wa_field_marked_12_blue">WA Teréní známé 12: Modrý Kolík</string>
-  <string name="wa_field_marked_24_blue">WA Teréní známé 24: Modrý Kolík</string>
-  <string name="wa_field_unmarked_12_blue">WA Teréní neznámé 12: Modrý Kolík</string>
-  <string name="wa_field_unmarked_24_blue">WA Teréní neznámé 24: Modrý Kolík</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Teréní 12 neznámé/12 známé: Žlutý Kolík</string>
-  <string name="wa_field_marked_12_yellow">WA Teréní známé 12: Žlutý Kolík</string>
-  <string name="wa_field_marked_24_yellow">WA Teréní známé 24: Žlutý Kolík</string>
-  <string name="wa_field_unmarked_12_yellow">WA Teréní neznámé 12: Žlutý Kolík</string>
-  <string name="wa_field_unmarked_24_yellow">WA Teréní neznámé 24: Žlutý Kolík</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA Trojičky</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA kombinované</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Hala: Dospělý/Mládež</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Hala: Děti</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Děti</string>
+    <string name="flint_bowman_indoor">Flint Bowman Hala</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA individuální eliminace kladkových luků 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA individuální eliminace kladkových luků 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA individuální eliminace kladkových luků 50m</string>
+    <string name="wa_recurve_elimination_18">WA eliminace reflexní luky 18m</string>
+    <string name="wa_recurve_elimination_50">WA eliminace reflexní luky 50m</string>
+    <string name="wa_recurve_elimination_60">WA eliminace reflexní luky 60m</string>
+    <string name="wa_recurve_elimination_70">WA eliminace reflexní luky 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA kladkové kvalifikace</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Krátké</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Děti</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junioři/mládež</string>
+    <string name="nfaa_600_cub">NFAA 600: Děti</string>
+    <string name="nfaa_600_junior">NFAA 600: Junioři/mládež</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Děti</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Teréní 12 neznámé/12 známé: Červený Kolík</string>
+    <string name="wa_field_marked_12_red">WA Teréní známé 12: Červený Kolík</string>
+    <string name="wa_field_marked_24_red">WA Teréní známé 24: Červený Kolík</string>
+    <string name="wa_field_unmarked_12_red">WA Teréní neznámé 12: Červený Kolík</string>
+    <string name="wa_field_unmarked_24_red">WA Teréní neznámé 24: Červený Kolík</string>
+    <string name="wa_field_unmarked_marked_blue">WA Teréní 12 neznámé/12 známé: Modrý Kolík</string>
+    <string name="wa_field_marked_12_blue">WA Teréní známé 12: Modrý Kolík</string>
+    <string name="wa_field_marked_24_blue">WA Teréní známé 24: Modrý Kolík</string>
+    <string name="wa_field_unmarked_12_blue">WA Teréní neznámé 12: Modrý Kolík</string>
+    <string name="wa_field_unmarked_24_blue">WA Teréní neznámé 24: Modrý Kolík</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Teréní 12 neznámé/12 známé: Žlutý Kolík</string>
+    <string name="wa_field_marked_12_yellow">WA Teréní známé 12: Žlutý Kolík</string>
+    <string name="wa_field_marked_24_yellow">WA Teréní známé 24: Žlutý Kolík</string>
+    <string name="wa_field_unmarked_12_yellow">WA Teréní neznámé 12: Žlutý Kolík</string>
+    <string name="wa_field_unmarked_24_yellow">WA Teréní neznámé 24: Žlutý Kolík</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-cs/strings.xml b/shared/src/main/res/values-cs/strings.xml
index 0db3236b3..c89fb690f 100644
--- a/shared/src/main/res/values-cs/strings.xml
+++ b/shared/src/main/res/values-cs/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Reflexní luk</string>
-  <string name="compound_bow">Kladkový luk</string>
-  <string name="bare_bow">Holý luk</string>
-  <string name="long_bow">Dlouhý luk</string>
-  <string name="horse_bow">Jezdecký luk</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Slunečno</string>
-  <string name="partly_cloudy">Polojasno</string>
-  <string name="cloudy">Zataženo</string>
-  <string name="light_rain">Slabý déšť</string>
-  <string name="rain">Deštivé</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d šípy (%4$s terč)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Malý</string>
-  <string name="medium">Střední</string>
-  <string name="large">Velký</string>
-  <string name="xlarge">Extra Velký</string>
-  <string name="unknown">Neznámý</string>
-  <string name="indoor">Halové</string>
-  <string name="wind">Vítr</string>
-  <string name="location">Umístění</string>
-  <string name="bft_0">0 Bft: bezvětří</string>
-  <string name="bft_1">1 Bft: listy se nepohybují</string>
-  <string name="bft_2">2 Bft: listy začínají pohybovat</string>
-  <string name="bft_3">3 Bft: lehké vlajky se začínají pohybovat</string>
-  <string name="bft_4">4 Bft: malé větve se začínají pohybovat</string>
-  <string name="bft_5">5 Bft: malé stromy se hejbou</string>
-  <string name="bft_6">6 Bft: velké větve se hejbou</string>
-  <string name="bft_7">7 Bft: celé stromy se hejbou</string>
-  <string name="bft_8">8 Bft: malé větve se lámou</string>
-  <string name="bft_9">9 Bft: škody z bouře</string>
-  <string name="front">zepředu</string>
-  <string name="back">zezadu</string>
-  <string name="left">zleva</string>
-  <string name="right">zprava</string>
-  <string name="left_front">přední levý</string>
-  <string name="right_front">přední pravý</string>
-  <string name="left_back">zadní levý</string>
-  <string name="right_back">zadní pravý</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Sada %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Vymazat</string>
-  <string name="accessibility_description_shot_n_score">Výstřel %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d kolo</item>
-    <item quantity="few">%d kola</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d kol</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d šíp</item>
-    <item quantity="few">%1$d \u00D7 %2$d šípy</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d šípů</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d šíp na sadu</item>
-    <item quantity="few">%d šípy na sadu</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d šípů na sadu</item>
-  </plurals>
+    <string name="recurve_bow">Reflexní luk</string>
+    <string name="compound_bow">Kladkový luk</string>
+    <string name="bare_bow">Holý luk</string>
+    <string name="long_bow">Dlouhý luk</string>
+    <string name="horse_bow">Jezdecký luk</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Slunečno</string>
+    <string name="partly_cloudy">Polojasno</string>
+    <string name="cloudy">Zataženo</string>
+    <string name="light_rain">Slabý déšť</string>
+    <string name="rain">Deštivé</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d šípy (%4$s terč)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Malý</string>
+    <string name="medium">Střední</string>
+    <string name="large">Velký</string>
+    <string name="xlarge">Extra Velký</string>
+    <string name="unknown">Neznámý</string>
+    <string name="indoor">Halové</string>
+    <string name="wind">Vítr</string>
+    <string name="location">Umístění</string>
+    <string name="bft_0">0 Bft: bezvětří</string>
+    <string name="bft_1">1 Bft: listy se nepohybují</string>
+    <string name="bft_2">2 Bft: listy začínají pohybovat</string>
+    <string name="bft_3">3 Bft: lehké vlajky se začínají pohybovat</string>
+    <string name="bft_4">4 Bft: malé větve se začínají pohybovat</string>
+    <string name="bft_5">5 Bft: malé stromy se hejbou</string>
+    <string name="bft_6">6 Bft: velké větve se hejbou</string>
+    <string name="bft_7">7 Bft: celé stromy se hejbou</string>
+    <string name="bft_8">8 Bft: malé větve se lámou</string>
+    <string name="bft_9">9 Bft: škody z bouře</string>
+    <string name="front">zepředu</string>
+    <string name="back">zezadu</string>
+    <string name="left">zleva</string>
+    <string name="right">zprava</string>
+    <string name="left_front">přední levý</string>
+    <string name="right_front">přední pravý</string>
+    <string name="left_back">zadní levý</string>
+    <string name="right_back">zadní pravý</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Sada %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Vymazat</string>
+    <string name="accessibility_description_shot_n_score">Výstřel %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d kolo</item>
+        <item quantity="few">%d kola</item>
+        <item quantity="many">%d kol</item>
+        <item quantity="other">%d kol</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d šíp</item>
+        <item quantity="few">%1$d \u00D7 %2$d šípy</item>
+        <item quantity="many">%1$d \u00D7 %2$d šípů</item>
+        <item quantity="other">%1$d \u00D7 %2$d šípů</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d šíp na sadu</item>
+        <item quantity="few">%d šípy na sadu</item>
+        <item quantity="many">%d šípů na sadu</item>
+        <item quantity="other">%d šípů na sadu</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-cs/target_faces.xml b/shared/src/main/res/values-cs/target_faces.xml
index d4e346017..1c7406340 100644
--- a/shared/src/main/res/values-cs/target_faces.xml
+++ b/shared/src/main/res/values-cs/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Klasický</string>
-  <string name="target_type_field_archery">Terénní</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA celý</string>
-  <string name="wa_6_ring">WA 6 kruhů</string>
-  <string name="wa_5_ring">WA 5 kruhů</string>
-  <string name="wa_3_ring">WA 3 kruhy</string>
-  <string name="vegas_3_spot">Vegas 3 terče</string>
-  <string name="vertical_3_spot">WA svislé 3 terče</string>
-  <string name="wa_3_ring_3_spot">WA 3 kruhy 3 terče</string>
-  <string name="nfaa_field">NFAA terénní</string>
-  <string name="nfaa_expert_field">NFAA Expert terénní</string>
-  <string name="nfaa_hunter">NFAA lovecký</string>
-  <string name="nfaa_indoor">NFAA halový</string>
-  <string name="nfaa_indoor_5_spot">NFAA halový 5 terčů</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA terénní</string>
-  <string name="hit_or_miss">Zásah nebo mimo</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA zvíře</string>
-  <string name="nfaa_animal">IFAA zvíře</string>
-  <string name="nfas_field">NFAA terénní</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA terénní 3 terče</string>
-  <string name="wa_danage_3_spot">WA Danage 3 terče</string>
-  <string name="wa_danage_6_spot">WA Danage 6 terčů</string>
-  <string name="dbsc_blowpipe">DBSC Foukačky</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS barvy (obrácené 10 – 1)</string>
-  <string name="recurve_style_x_1">Reflexní styl (X-1)</string>
-  <string name="recurve_style_10_1">Reflexní styl (10-1)</string>
-  <string name="recurve_style_x_5">Reflexní styl (X-5)</string>
-  <string name="recurve_style_10_5">Reflexní styl (10–5)</string>
-  <string name="recurve_style_x_6">Reflexní styl (X-6)</string>
-  <string name="recurve_style_10_6">Reflexní styl (10–6)</string>
-  <string name="recurve_style_x_8">Reflexní styl (X-8)</string>
-  <string name="recurve_style_10_8">Reflexní styl (10–8)</string>
-  <string name="compound_style">Kladkový styl</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Klasický</string>
+    <string name="target_type_field_archery">Terénní</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA celý</string>
+    <string name="wa_6_ring">WA 6 kruhů</string>
+    <string name="wa_5_ring">WA 5 kruhů</string>
+    <string name="wa_3_ring">WA 3 kruhy</string>
+    <string name="vegas_3_spot">Vegas 3 terče</string>
+    <string name="vertical_3_spot">WA svislé 3 terče</string>
+    <string name="wa_3_ring_3_spot">WA 3 kruhy 3 terče</string>
+    <string name="nfaa_field">NFAA terénní</string>
+    <string name="nfaa_expert_field">NFAA Expert terénní</string>
+    <string name="nfaa_hunter">NFAA lovecký</string>
+    <string name="nfaa_indoor">NFAA halový</string>
+    <string name="nfaa_indoor_5_spot">NFAA halový 5 terčů</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA terénní</string>
+    <string name="hit_or_miss">Zásah nebo mimo</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA zvíře</string>
+    <string name="nfaa_animal">IFAA zvíře</string>
+    <string name="nfas_field">NFAA terénní</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA terénní 3 terče</string>
+    <string name="wa_danage_3_spot">WA Danage 3 terče</string>
+    <string name="wa_danage_6_spot">WA Danage 6 terčů</string>
+    <string name="dbsc_blowpipe">DBSC Foukačky</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS barvy (obrácené 10 – 1)</string>
+    <string name="recurve_style_x_1">Reflexní styl (X-1)</string>
+    <string name="recurve_style_10_1">Reflexní styl (10-1)</string>
+    <string name="recurve_style_x_5">Reflexní styl (X-5)</string>
+    <string name="recurve_style_10_5">Reflexní styl (10–5)</string>
+    <string name="recurve_style_x_6">Reflexní styl (X-6)</string>
+    <string name="recurve_style_10_6">Reflexní styl (10–6)</string>
+    <string name="recurve_style_x_8">Reflexní styl (X-8)</string>
+    <string name="recurve_style_10_8">Reflexní styl (10–8)</string>
+    <string name="compound_style">Kladkový styl</string>
 </resources>
diff --git a/shared/src/main/res/values-da/rounds.xml b/shared/src/main/res/values-da/rounds.xml
index cb572fbb9..9c47f2eeb 100644
--- a/shared/src/main/res/values-da/rounds.xml
+++ b/shared/src/main/res/values-da/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australsk indendørs 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA tripple</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match runde</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 indendørs: Voksen/ungdom</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 indendørs: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Compound Individuel eliminering 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Compound Individuel eliminering 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Compound Individuel eliminering 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound individuel</string>
-  <string name="wa_compound_qualification">WA Compound kvalifikation</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympisk runde</string>
-  <string name="wa_1440_junior_men">WA 1440 Herre Junior</string>
-  <string name="wa_1440_junior_women">WA 1440 Dame Junior </string>
-  <string name="wa_1440_men_master_50">WA 1440 Herre Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Herre Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Herre Master 70 +</string>
-  <string name="wa_1440_men_senior">WA 1440 Herre Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Dame Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 kvinder Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Dame Masters 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Dame Senior</string>
-  <string name="half_wa_1440_cadet_men">Halv WA 1440 Herre Kadet</string>
-  <string name="half_wa_1440_cadet_women">Halv WA 1440 Dame Kadet</string>
-  <string name="half_wa_1440_junior_men">Halv WA 1440 Herre Junior</string>
-  <string name="half_wa_1440_junior_women">Halv WA 1440 Dame Junior</string>
-  <string name="half_wa_1440_men_master_50">Halv WA 1440 Herre Masters 50+</string>
-  <string name="half_wa_1440_men_master_60">Halv WA 1440 Herre Masters 60+</string>
-  <string name="half_wa_1440_men_master_70">Halv WA 1440 Herre Masters 70+</string>
-  <string name="half_wa_1440_men_senior">Halv WA 1440 Herre Senior</string>
-  <string name="half_wa_1440_women_master_50">Halv WA 1440 Dame Masters 50+</string>
-  <string name="half_wa_1440_women_master_60">Halv WA 1440 Dame Masters 60+</string>
-  <string name="half_wa_1440_women_master_70">Halv WA 1440 Dame Masters 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Dame Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australsk indendørs 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA tripple</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match runde</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 indendørs: Voksen/ungdom</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 indendørs: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Compound Individuel eliminering 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Compound Individuel eliminering 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Compound Individuel eliminering 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound individuel</string>
+    <string name="wa_compound_qualification">WA Compound kvalifikation</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympisk runde</string>
+    <string name="wa_1440_junior_men">WA 1440 Herre Junior</string>
+    <string name="wa_1440_junior_women">WA 1440 Dame Junior </string>
+    <string name="wa_1440_men_master_50">WA 1440 Herre Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Herre Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Herre Master 70 +</string>
+    <string name="wa_1440_men_senior">WA 1440 Herre Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Dame Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 kvinder Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Dame Masters 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Dame Senior</string>
+    <string name="half_wa_1440_cadet_men">Halv WA 1440 Herre Kadet</string>
+    <string name="half_wa_1440_cadet_women">Halv WA 1440 Dame Kadet</string>
+    <string name="half_wa_1440_junior_men">Halv WA 1440 Herre Junior</string>
+    <string name="half_wa_1440_junior_women">Halv WA 1440 Dame Junior</string>
+    <string name="half_wa_1440_men_master_50">Halv WA 1440 Herre Masters 50+</string>
+    <string name="half_wa_1440_men_master_60">Halv WA 1440 Herre Masters 60+</string>
+    <string name="half_wa_1440_men_master_70">Halv WA 1440 Herre Masters 70+</string>
+    <string name="half_wa_1440_men_senior">Halv WA 1440 Herre Senior</string>
+    <string name="half_wa_1440_women_master_50">Halv WA 1440 Dame Masters 50+</string>
+    <string name="half_wa_1440_women_master_60">Halv WA 1440 Dame Masters 60+</string>
+    <string name="half_wa_1440_women_master_70">Halv WA 1440 Dame Masters 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Dame Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-da/strings.xml b/shared/src/main/res/values-da/strings.xml
index 0fd7bcd11..c622104b3 100644
--- a/shared/src/main/res/values-da/strings.xml
+++ b/shared/src/main/res/values-da/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurvebue</string>
-  <string name="compound_bow">Compoundbue</string>
-  <string name="bare_bow">Barbue</string>
-  <string name="long_bow">Langbue</string>
-  <string name="horse_bow">Hestebue</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Solrigt</string>
-  <string name="partly_cloudy">Delvist skyet</string>
-  <string name="cloudy">Skyet</string>
-  <string name="light_rain">Let regn</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Lille</string>
-  <string name="medium">Mellem</string>
-  <string name="large">Stor</string>
-  <string name="xlarge">Ekstra stor</string>
-  <string name="unknown">Ukendt</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Vind</string>
-  <string name="location">Sted</string>
-  <string name="bft_0">0 Bft: vindstille</string>
-  <string name="bft_1">1 Bft: Blade bevæger sig ikke</string>
-  <string name="bft_2">2 Bft: Bladene begynder at bevæge sig</string>
-  <string name="bft_3">3 Bft: Lette flag begynder at bevæge sig</string>
-  <string name="bft_4">4 Bft: Små grene begynder at bevæge sig</string>
-  <string name="bft_5">5 Bft: Små træer bevæger sig</string>
-  <string name="bft_6">6 Bft: Store grene bevæger sig</string>
-  <string name="bft_7">7 Bft: Træer bevæger sig</string>
-  <string name="bft_8">8 Bft: Små grene knækker</string>
-  <string name="bft_9">9 Bft: Storm skader</string>
-  <string name="front">Forfra</string>
-  <string name="back">Bagfra</string>
-  <string name="left">fra venstre</string>
-  <string name="right">fra højre</string>
-  <string name="left_front">Fra venstre forfra</string>
-  <string name="right_front">Fra højre forfra</string>
-  <string name="left_back">Fra venstre bagfra</string>
-  <string name="right_back">Fra højre forfra</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurvebue</string>
+    <string name="compound_bow">Compoundbue</string>
+    <string name="bare_bow">Barbue</string>
+    <string name="long_bow">Langbue</string>
+    <string name="horse_bow">Hestebue</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Solrigt</string>
+    <string name="partly_cloudy">Delvist skyet</string>
+    <string name="cloudy">Skyet</string>
+    <string name="light_rain">Let regn</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Lille</string>
+    <string name="medium">Mellem</string>
+    <string name="large">Stor</string>
+    <string name="xlarge">Ekstra stor</string>
+    <string name="unknown">Ukendt</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Vind</string>
+    <string name="location">Sted</string>
+    <string name="bft_0">0 Bft: vindstille</string>
+    <string name="bft_1">1 Bft: Blade bevæger sig ikke</string>
+    <string name="bft_2">2 Bft: Bladene begynder at bevæge sig</string>
+    <string name="bft_3">3 Bft: Lette flag begynder at bevæge sig</string>
+    <string name="bft_4">4 Bft: Små grene begynder at bevæge sig</string>
+    <string name="bft_5">5 Bft: Små træer bevæger sig</string>
+    <string name="bft_6">6 Bft: Store grene bevæger sig</string>
+    <string name="bft_7">7 Bft: Træer bevæger sig</string>
+    <string name="bft_8">8 Bft: Små grene knækker</string>
+    <string name="bft_9">9 Bft: Storm skader</string>
+    <string name="front">Forfra</string>
+    <string name="back">Bagfra</string>
+    <string name="left">fra venstre</string>
+    <string name="right">fra højre</string>
+    <string name="left_front">Fra venstre forfra</string>
+    <string name="right_front">Fra højre forfra</string>
+    <string name="left_back">Fra venstre bagfra</string>
+    <string name="right_back">Fra højre forfra</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-da/target_faces.xml b/shared/src/main/res/values-da/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-da/target_faces.xml
+++ b/shared/src/main/res/values-da/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-de/rounds.xml b/shared/src/main/res/values-de/rounds.xml
index 43f4bb859..d26dc7ab1 100644
--- a/shared/src/main/res/values-de/rounds.xml
+++ b/shared/src/main/res/values-de/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Kombiniert Halle</string>
-  <string name="australian_indoor_1">Australian Halle 1</string>
-  <string name="australian_indoor_2">Australian Halle 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Kombiniert</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Erwachsene/Jugend</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Elimination Einzelwettbewerb Compound 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Elimination Einzelwettbewerb Compound 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Elimination Einzelwettbewerb Compound 50m</string>
-  <string name="wa_recurve_elimination_18">WA Elimination Recurve 18m</string>
-  <string name="wa_recurve_elimination_50">WA Elimination Recurve 50m</string>
-  <string name="wa_recurve_elimination_60">WA Elimination Recurve 60m</string>
-  <string name="wa_recurve_elimination_70">WA Elimination Recurve 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Schüler männlich</string>
-  <string name="wa_1440_cadet_women">WA 1440 Schüler weiblich</string>
-  <string name="wa_compound_individual">WA Compound Einzelwertung</string>
-  <string name="wa_compound_qualification">WA Compound Qualifikation</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympische Runde</string>
-  <string name="wa_1440_junior_men">WA 1440 Junioren männlich</string>
-  <string name="wa_1440_junior_women">WA 1440 Junioren weiblich</string>
-  <string name="wa_1440_men_master_50">WA 1440 Herren Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Herren Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Herren Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Herren Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Damen Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Damen Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Damen Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Damen Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Schüler männlich</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Schüler weiblich</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junioren männlich</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junioren weiblich</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Herren Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Herren Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Herren Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Herren Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Damen Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Damen Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Damen Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Damen Senior</string>
-  <string name="wa_double_720_30_80cm">WA Doppel 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Doppel 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Doppel 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Doppel 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Doppel 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Doppel 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Doppel 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Herren)</string>
-  <string name="long_metric_ladies">Long Metric (Damen)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Klassisch/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Klassisch/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Klassisch/Dakota: Junioren</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junioren</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junioren</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junioren</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Nur 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarkiert/12 Markiert: Rote Pflöcke</string>
-  <string name="wa_field_marked_12_red">WA Field Markiert 12: Rote Pflöcke</string>
-  <string name="wa_field_marked_24_red">WA Field Markiert 24: Rote Pflöcke</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarkiert 12: Rote Pflöcke</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarkiert 24: Rote Pflöcke</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarkiert/12 Markiert: Blaue Pflöcke</string>
-  <string name="wa_field_marked_12_blue">WA Field Markiert 12: Blaue Pflöcke</string>
-  <string name="wa_field_marked_24_blue">WA Field Markiert 24: Blaue Pflöcke</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarkiert 12: Blaue Pflöcke</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarkiert 24: Blaue Pflöcke</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarkiert/12 Markiert: Gelbe Pflöcke</string>
-  <string name="wa_field_marked_12_yellow">WA Field Markiert 12: Gelbe Pflöcke</string>
-  <string name="wa_field_marked_24_yellow">WA Field Markiert 24: Gelbe Pflöcke</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarkiert 12: Gelbe Pflöcke</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarkiert 24: Gelbe Pflöcke</string>
-  <string name="big_game_36">Großes Spiel 36</string>
-  <string name="big_game_40">Großes Spiel 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Kombiniert Halle</string>
+    <string name="australian_indoor_1">Australian Halle 1</string>
+    <string name="australian_indoor_2">Australian Halle 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Kombiniert</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Erwachsene/Jugend</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Elimination Einzelwettbewerb Compound 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Elimination Einzelwettbewerb Compound 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Elimination Einzelwettbewerb Compound 50m</string>
+    <string name="wa_recurve_elimination_18">WA Elimination Recurve 18m</string>
+    <string name="wa_recurve_elimination_50">WA Elimination Recurve 50m</string>
+    <string name="wa_recurve_elimination_60">WA Elimination Recurve 60m</string>
+    <string name="wa_recurve_elimination_70">WA Elimination Recurve 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Schüler männlich</string>
+    <string name="wa_1440_cadet_women">WA 1440 Schüler weiblich</string>
+    <string name="wa_compound_individual">WA Compound Einzelwertung</string>
+    <string name="wa_compound_qualification">WA Compound Qualifikation</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympische Runde</string>
+    <string name="wa_1440_junior_men">WA 1440 Junioren männlich</string>
+    <string name="wa_1440_junior_women">WA 1440 Junioren weiblich</string>
+    <string name="wa_1440_men_master_50">WA 1440 Herren Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Herren Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Herren Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Herren Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Damen Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Damen Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Damen Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Damen Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Schüler männlich</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Schüler weiblich</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junioren männlich</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junioren weiblich</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Herren Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Herren Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Herren Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Herren Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Damen Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Damen Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Damen Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Damen Senior</string>
+    <string name="wa_double_720_30_80cm">WA Doppel 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Doppel 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Doppel 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Doppel 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Doppel 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Doppel 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Doppel 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Herren)</string>
+    <string name="long_metric_ladies">Long Metric (Damen)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Klassisch/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Klassisch/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Klassisch/Dakota: Junioren</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junioren</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junioren</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junioren</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Nur 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarkiert/12 Markiert: Rote Pflöcke</string>
+    <string name="wa_field_marked_12_red">WA Field Markiert 12: Rote Pflöcke</string>
+    <string name="wa_field_marked_24_red">WA Field Markiert 24: Rote Pflöcke</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarkiert 12: Rote Pflöcke</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarkiert 24: Rote Pflöcke</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarkiert/12 Markiert: Blaue Pflöcke</string>
+    <string name="wa_field_marked_12_blue">WA Field Markiert 12: Blaue Pflöcke</string>
+    <string name="wa_field_marked_24_blue">WA Field Markiert 24: Blaue Pflöcke</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarkiert 12: Blaue Pflöcke</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarkiert 24: Blaue Pflöcke</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarkiert/12 Markiert: Gelbe Pflöcke</string>
+    <string name="wa_field_marked_12_yellow">WA Field Markiert 12: Gelbe Pflöcke</string>
+    <string name="wa_field_marked_24_yellow">WA Field Markiert 24: Gelbe Pflöcke</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarkiert 12: Gelbe Pflöcke</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarkiert 24: Gelbe Pflöcke</string>
+    <string name="big_game_36">Großes Spiel 36</string>
+    <string name="big_game_40">Großes Spiel 40</string>
 </resources>
diff --git a/shared/src/main/res/values-de/strings.xml b/shared/src/main/res/values-de/strings.xml
index 64d8a0f14..9663e86d8 100644
--- a/shared/src/main/res/values-de/strings.xml
+++ b/shared/src/main/res/values-de/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurvebogen</string>
-  <string name="compound_bow">Compoundbogen</string>
-  <string name="bare_bow">Blankbogen</string>
-  <string name="long_bow">Langbogen</string>
-  <string name="horse_bow">Reiterbogen</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sonnig</string>
-  <string name="partly_cloudy">Teilweise bewölkt</string>
-  <string name="cloudy">Bewölkt</string>
-  <string name="light_rain">Leichter Regen</string>
-  <string name="rain">Regen</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d Pfeile (%4$s Auflage)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Klein</string>
-  <string name="medium">Mittel</string>
-  <string name="large">Groß</string>
-  <string name="xlarge">XL</string>
-  <string name="unknown">Unbekannt</string>
-  <string name="indoor">Halle</string>
-  <string name="wind">Wind</string>
-  <string name="location">Standort</string>
-  <string name="bft_0">0 Bft: Windstill</string>
-  <string name="bft_1">1 Bft: Blätter bewegen sich nicht</string>
-  <string name="bft_2">2 Bft: Blätter bewegen sich</string>
-  <string name="bft_3">3 Bft: Leichte Flaggen bewegen sich</string>
-  <string name="bft_4">4 Bft: Kleine Äste bewegen sich</string>
-  <string name="bft_5">5 Bft: Kleine Bäume bewegen sich</string>
-  <string name="bft_6">6 Bft: Große Äste bewegen sich</string>
-  <string name="bft_7">7 Bft: Ganze Bäume bewegen sich</string>
-  <string name="bft_8">8 Bft: Kleine Äste brechen</string>
-  <string name="bft_9">9 Bft: Sturmschäden</string>
-  <string name="front">von vorne</string>
-  <string name="back">von hinten</string>
-  <string name="left">von links</string>
-  <string name="right">von rechts</string>
-  <string name="left_front">von vorne links</string>
-  <string name="right_front">von vorne rechts</string>
-  <string name="left_back">von hinten links</string>
-  <string name="right_back">von hinten rechts</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Passe %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Löschen</string>
-  <string name="accessibility_description_shot_n_score">Schuss %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d Runde</item>
-    <item quantity="other">%d Runden</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d Pfeil</item>
-    <item quantity="other">%1$d \u00D7 %2$d Pfeile</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d Pfeil pro Passe</item>
-    <item quantity="other">%d Pfeile pro Passe</item>
-  </plurals>
+    <string name="recurve_bow">Recurvebogen</string>
+    <string name="compound_bow">Compoundbogen</string>
+    <string name="bare_bow">Blankbogen</string>
+    <string name="long_bow">Langbogen</string>
+    <string name="horse_bow">Reiterbogen</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sonnig</string>
+    <string name="partly_cloudy">Teilweise bewölkt</string>
+    <string name="cloudy">Bewölkt</string>
+    <string name="light_rain">Leichter Regen</string>
+    <string name="rain">Regen</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d Pfeile (%4$s Auflage)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Klein</string>
+    <string name="medium">Mittel</string>
+    <string name="large">Groß</string>
+    <string name="xlarge">XL</string>
+    <string name="unknown">Unbekannt</string>
+    <string name="indoor">Halle</string>
+    <string name="wind">Wind</string>
+    <string name="location">Standort</string>
+    <string name="bft_0">0 Bft: Windstill</string>
+    <string name="bft_1">1 Bft: Blätter bewegen sich nicht</string>
+    <string name="bft_2">2 Bft: Blätter bewegen sich</string>
+    <string name="bft_3">3 Bft: Leichte Flaggen bewegen sich</string>
+    <string name="bft_4">4 Bft: Kleine Äste bewegen sich</string>
+    <string name="bft_5">5 Bft: Kleine Bäume bewegen sich</string>
+    <string name="bft_6">6 Bft: Große Äste bewegen sich</string>
+    <string name="bft_7">7 Bft: Ganze Bäume bewegen sich</string>
+    <string name="bft_8">8 Bft: Kleine Äste brechen</string>
+    <string name="bft_9">9 Bft: Sturmschäden</string>
+    <string name="front">von vorne</string>
+    <string name="back">von hinten</string>
+    <string name="left">von links</string>
+    <string name="right">von rechts</string>
+    <string name="left_front">von vorne links</string>
+    <string name="right_front">von vorne rechts</string>
+    <string name="left_back">von hinten links</string>
+    <string name="right_back">von hinten rechts</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Passe %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Löschen</string>
+    <string name="accessibility_description_shot_n_score">Schuss %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d Runde</item>
+        <item quantity="other">%d Runden</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d Pfeil</item>
+        <item quantity="other">%1$d \u00D7 %2$d Pfeile</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d Pfeil pro Passe</item>
+        <item quantity="other">%d Pfeile pro Passe</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-de/target_faces.xml b/shared/src/main/res/values-de/target_faces.xml
index 1d4cdb696..4934b2c30 100644
--- a/shared/src/main/res/values-de/target_faces.xml
+++ b/shared/src/main/res/values-de/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Normal</string>
-  <string name="target_type_field_archery">Feld</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Vollauflage</string>
-  <string name="wa_6_ring">WA 6 Ringe</string>
-  <string name="wa_5_ring">WA 5 Ringe</string>
-  <string name="wa_3_ring">WA 3 Ringe</string>
-  <string name="vegas_3_spot">Vegas 3er Spot</string>
-  <string name="vertical_3_spot">WA Vertikaler 3er Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ringe 3er Spot</string>
-  <string name="nfaa_field">NFAA Feld</string>
-  <string name="nfaa_expert_field">NFAA Expert Feld</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Halle</string>
-  <string name="nfaa_indoor_5_spot">NFAA Halle 5er Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Feld</string>
-  <string name="hit_or_miss">Hit oder Miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Tier</string>
-  <string name="nfaa_animal">NFAA Tier</string>
-  <string name="nfas_field">NFAS Feld</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Feld 3er Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blasrohr</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Farbe (10-1 umgekehrt)</string>
-  <string name="recurve_style_x_1">Recurve-Stil (X-1)</string>
-  <string name="recurve_style_10_1">Recurve-Stil (10-1)</string>
-  <string name="recurve_style_x_5">Recurve-Stil (X-5)</string>
-  <string name="recurve_style_10_5">Recurve-Stil (10-5)</string>
-  <string name="recurve_style_x_6">Recurve-Stil (X-6)</string>
-  <string name="recurve_style_10_6">Recurve-Stil (10-6)</string>
-  <string name="recurve_style_x_8">Recurve-Stil (X-8)</string>
-  <string name="recurve_style_10_8">Recurve-Stil (10-8)</string>
-  <string name="compound_style">Compound-Stil</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Normal</string>
+    <string name="target_type_field_archery">Feld</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Vollauflage</string>
+    <string name="wa_6_ring">WA 6 Ringe</string>
+    <string name="wa_5_ring">WA 5 Ringe</string>
+    <string name="wa_3_ring">WA 3 Ringe</string>
+    <string name="vegas_3_spot">Vegas 3er Spot</string>
+    <string name="vertical_3_spot">WA Vertikaler 3er Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ringe 3er Spot</string>
+    <string name="nfaa_field">NFAA Feld</string>
+    <string name="nfaa_expert_field">NFAA Expert Feld</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Halle</string>
+    <string name="nfaa_indoor_5_spot">NFAA Halle 5er Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Feld</string>
+    <string name="hit_or_miss">Hit oder Miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Tier</string>
+    <string name="nfaa_animal">NFAA Tier</string>
+    <string name="nfas_field">NFAS Feld</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Feld 3er Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blasrohr</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Farbe (10-1 umgekehrt)</string>
+    <string name="recurve_style_x_1">Recurve-Stil (X-1)</string>
+    <string name="recurve_style_10_1">Recurve-Stil (10-1)</string>
+    <string name="recurve_style_x_5">Recurve-Stil (X-5)</string>
+    <string name="recurve_style_10_5">Recurve-Stil (10-5)</string>
+    <string name="recurve_style_x_6">Recurve-Stil (X-6)</string>
+    <string name="recurve_style_10_6">Recurve-Stil (10-6)</string>
+    <string name="recurve_style_x_8">Recurve-Stil (X-8)</string>
+    <string name="recurve_style_10_8">Recurve-Stil (10-8)</string>
+    <string name="compound_style">Compound-Stil</string>
 </resources>
diff --git a/shared/src/main/res/values-el/rounds.xml b/shared/src/main/res/values-el/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-el/rounds.xml
+++ b/shared/src/main/res/values-el/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-el/strings.xml b/shared/src/main/res/values-el/strings.xml
index 7b8c04ef1..a07db414a 100644
--- a/shared/src/main/res/values-el/strings.xml
+++ b/shared/src/main/res/values-el/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-el/target_faces.xml b/shared/src/main/res/values-el/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-el/target_faces.xml
+++ b/shared/src/main/res/values-el/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-es/rounds.xml b/shared/src/main/res/values-es/rounds.xml
index 82eee43fe..dbfe227d2 100644
--- a/shared/src/main/res/values-es/rounds.xml
+++ b/shared/src/main/res/values-es/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australiana combinada Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">18 WA (40cm)</string>
-  <string name="wa_18_60cm">18 WA (60cm)</string>
-  <string name="wa_3_spot">WA 3 Dianas</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA combinada</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 indoor: adultos y jóvenes</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">Individual WA 18m Compuesto Eliminación</string>
-  <string name="wa_individual_compound_eleminiation_40">Individual WA 40m Compuesto Eliminación</string>
-  <string name="wa_individual_compound_eleminiation_50">Individual WA 50m Compuesto Eliminación</string>
-  <string name="wa_recurve_elimination_18">WA 18m Recurvo Eliminación</string>
-  <string name="wa_recurve_elimination_50">WA 50m Recurvo Eliminación</string>
-  <string name="wa_recurve_elimination_60">WA 60m Recurvo Eliminación</string>
-  <string name="wa_recurve_elimination_70">WA 70m Recurvo Eliminación</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadete Femenino</string>
-  <string name="wa_compound_individual">WA Compuesto Individual</string>
-  <string name="wa_compound_qualification">WA Compuesto Calificación</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Estandar</string>
-  <string name="olympic_round">Serie Olímpica</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Masculino</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Femenino</string>
-  <string name="wa_1440_men_master_50">WA 1440 Junior Masculino +50</string>
-  <string name="wa_1440_men_master_60">WA 1440 Junior Masculino +60</string>
-  <string name="wa_1440_men_master_70">WA 1440 Junior Masculino +70</string>
-  <string name="wa_1440_men_senior">WA 1440 Senior Masculino</string>
-  <string name="wa_1440_women_master_50">WA 1440 Femenino Master +50</string>
-  <string name="wa_1440_women_master_60">WA 1440 Femenino Master +60</string>
-  <string name="wa_1440_women_master_70">WA 1440 Femenino Master +70</string>
-  <string name="wa_1440_women_senior">WA 1440 mujeres Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 cadete hombres</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 cadete mujeres</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior hombres</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior mujeres</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 hombres Master +50</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 hombres Master +60</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 hombres Master +70</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 hombres Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Mujeres Master +50</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Mujeres Master +60</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Mujeres Master +70</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Mujeres Senior</string>
-  <string name="wa_double_720_30_80cm">WA 720 doble 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA 720 doble 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA 720 doble 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA 720 doble 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA 720 doble 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA 720 doble 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA 720 doble 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol l</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Nacional Junior</string>
-  <string name="short_junior_warwick">Short Warwick Junior</string>
-  <string name="short_junior_western">Short Western Junior</string>
-  <string name="short_junior_windsor">Short Windsor Junior</string>
-  <string name="junior_national">Nacional Junior</string>
-  <string name="junior_warwick">Warwick Junior</string>
-  <string name="junior_western">Western Junior</string>
-  <string name="junior_windsor">Windsor Junior</string>
-  <string name="short_national">Short nacional</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">Nacional</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">San Nicolás</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long nacional</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long occidental</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Señores)</string>
-  <string name="long_metric_ladies">Long Metric (Damas)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Adelaida corto</string>
-  <string name="short_canberra">Canberra Corto</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 clásico/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 clásico/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 clásico/Dakota: Junior/Joven</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/americano 900</string>
-  <string name="nfaa_900_cub">NFAA/americano 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/americano 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA internacional 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA internacional 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field sólo 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">Wa Field 12 Unmarked/12 Market: Red Pegs</string>
-  <string name="wa_field_marked_12_red">Wa Field Market 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">Wa Field Market 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">Wa Field UnMarket 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">Wa Field UnMarket 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">Wa Field 12 Unmarked/12 Market: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">Wa Field Market 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">Wa Field Market 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">Wa Field UnMarket 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">Wa Field UnMarket 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">Wa Field 12 Unmarked/12 Market: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">Wa Field Market 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">Wa Field Market 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">Wa Field UnMarket 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">Wa Field UnMarket 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australiana combinada Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">18 WA (40cm)</string>
+    <string name="wa_18_60cm">18 WA (60cm)</string>
+    <string name="wa_3_spot">WA 3 Dianas</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA combinada</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 indoor: adultos y jóvenes</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">Individual WA 18m Compuesto Eliminación</string>
+    <string name="wa_individual_compound_eleminiation_40">Individual WA 40m Compuesto Eliminación</string>
+    <string name="wa_individual_compound_eleminiation_50">Individual WA 50m Compuesto Eliminación</string>
+    <string name="wa_recurve_elimination_18">WA 18m Recurvo Eliminación</string>
+    <string name="wa_recurve_elimination_50">WA 50m Recurvo Eliminación</string>
+    <string name="wa_recurve_elimination_60">WA 60m Recurvo Eliminación</string>
+    <string name="wa_recurve_elimination_70">WA 70m Recurvo Eliminación</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadete Femenino</string>
+    <string name="wa_compound_individual">WA Compuesto Individual</string>
+    <string name="wa_compound_qualification">WA Compuesto Calificación</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Estandar</string>
+    <string name="olympic_round">Serie Olímpica</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Masculino</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Femenino</string>
+    <string name="wa_1440_men_master_50">WA 1440 Junior Masculino +50</string>
+    <string name="wa_1440_men_master_60">WA 1440 Junior Masculino +60</string>
+    <string name="wa_1440_men_master_70">WA 1440 Junior Masculino +70</string>
+    <string name="wa_1440_men_senior">WA 1440 Senior Masculino</string>
+    <string name="wa_1440_women_master_50">WA 1440 Femenino Master +50</string>
+    <string name="wa_1440_women_master_60">WA 1440 Femenino Master +60</string>
+    <string name="wa_1440_women_master_70">WA 1440 Femenino Master +70</string>
+    <string name="wa_1440_women_senior">WA 1440 mujeres Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 cadete hombres</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 cadete mujeres</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior hombres</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior mujeres</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 hombres Master +50</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 hombres Master +60</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 hombres Master +70</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 hombres Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Mujeres Master +50</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Mujeres Master +60</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Mujeres Master +70</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Mujeres Senior</string>
+    <string name="wa_double_720_30_80cm">WA 720 doble 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA 720 doble 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA 720 doble 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA 720 doble 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA 720 doble 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA 720 doble 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA 720 doble 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol l</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Nacional Junior</string>
+    <string name="short_junior_warwick">Short Warwick Junior</string>
+    <string name="short_junior_western">Short Western Junior</string>
+    <string name="short_junior_windsor">Short Windsor Junior</string>
+    <string name="junior_national">Nacional Junior</string>
+    <string name="junior_warwick">Warwick Junior</string>
+    <string name="junior_western">Western Junior</string>
+    <string name="junior_windsor">Windsor Junior</string>
+    <string name="short_national">Short nacional</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">Nacional</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">San Nicolás</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long nacional</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long occidental</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Señores)</string>
+    <string name="long_metric_ladies">Long Metric (Damas)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Adelaida corto</string>
+    <string name="short_canberra">Canberra Corto</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 clásico/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 clásico/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 clásico/Dakota: Junior/Joven</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/americano 900</string>
+    <string name="nfaa_900_cub">NFAA/americano 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/americano 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA internacional 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA internacional 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field sólo 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">Wa Field 12 Unmarked/12 Market: Red Pegs</string>
+    <string name="wa_field_marked_12_red">Wa Field Market 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">Wa Field Market 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">Wa Field UnMarket 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">Wa Field UnMarket 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">Wa Field 12 Unmarked/12 Market: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">Wa Field Market 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">Wa Field Market 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">Wa Field UnMarket 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">Wa Field UnMarket 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">Wa Field 12 Unmarked/12 Market: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">Wa Field Market 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">Wa Field Market 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">Wa Field UnMarket 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">Wa Field UnMarket 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-es/strings.xml b/shared/src/main/res/values-es/strings.xml
index 41094670c..025361f70 100644
--- a/shared/src/main/res/values-es/strings.xml
+++ b/shared/src/main/res/values-es/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arco Recurvo</string>
-  <string name="compound_bow">Arco Compuesto</string>
-  <string name="bare_bow">Arco Desnudo</string>
-  <string name="long_bow">Longbow</string>
-  <string name="horse_bow">Arco Horse</string>
-  <string name="yumi">Arco Yumi</string>
-  <string name="sunny">Soleado</string>
-  <string name="partly_cloudy">Parcialmente nublado</string>
-  <string name="cloudy">Nublado</string>
-  <string name="light_rain">Lluvia Suave</string>
-  <string name="rain">Lluvioso</string>
-  <string name="round_desc">%1$s: %2$d × %3$d flechas (Tamaño%4$s)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Pequeño</string>
-  <string name="medium">Mediano</string>
-  <string name="large">Grande</string>
-  <string name="xlarge">Extra Grande</string>
-  <string name="unknown">Desconocido</string>
-  <string name="indoor">Sala</string>
-  <string name="wind">Viento</string>
-  <string name="location">Localización</string>
-  <string name="bft_0">Bft 0: sin viento</string>
-  <string name="bft_1">1 Bft: hojas no se mueven</string>
-  <string name="bft_2">2 Bft: hojas empiezan a moverse</string>
-  <string name="bft_3">3 Bft: los banderines empiezan a moverse</string>
-  <string name="bft_4">4 Bft: lasramas pequeñas empiezan a moverse</string>
-  <string name="bft_5">5 Bft: los árboles pequeños se mueven</string>
-  <string name="bft_6">6 Bft: Las grandes ramas se mueven</string>
-  <string name="bft_7">7 Bft: Se mueven los árboles</string>
-  <string name="bft_8">8 Bft: rotura de pequeñas ramas</string>
-  <string name="bft_9">9 Bft: Tormenta con daños</string>
-  <string name="front">de frente</string>
-  <string name="back">de espalda</string>
-  <string name="left">desde la izquierda</string>
-  <string name="right">de la derecha</string>
-  <string name="left_front">de delantero izquierdo</string>
-  <string name="right_front">de delantero derecho</string>
-  <string name="left_back">de la parte posterior izquierda</string>
-  <string name="right_back">de derecha trasera</string>
-  <string name="stop">Stop</string>
-  <string name="end_n">%d entrada</string>
-  <string name="miss">Perdida</string>
-  <string name="backspace">Atras</string>
-  <string name="accessibility_description_shot_n_score">Tiro %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d rondas</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d flechas</item>
-    <item quantity="other">%1$d \u00D7 %2$d flechas</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">flecha %d por entrada</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Arco Recurvo</string>
+    <string name="compound_bow">Arco Compuesto</string>
+    <string name="bare_bow">Arco Desnudo</string>
+    <string name="long_bow">Longbow</string>
+    <string name="horse_bow">Arco Horse</string>
+    <string name="yumi">Arco Yumi</string>
+    <string name="sunny">Soleado</string>
+    <string name="partly_cloudy">Parcialmente nublado</string>
+    <string name="cloudy">Nublado</string>
+    <string name="light_rain">Lluvia Suave</string>
+    <string name="rain">Lluvioso</string>
+    <string name="round_desc">%1$s: %2$d × %3$d flechas (Tamaño%4$s)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Pequeño</string>
+    <string name="medium">Mediano</string>
+    <string name="large">Grande</string>
+    <string name="xlarge">Extra Grande</string>
+    <string name="unknown">Desconocido</string>
+    <string name="indoor">Sala</string>
+    <string name="wind">Viento</string>
+    <string name="location">Localización</string>
+    <string name="bft_0">Bft 0: sin viento</string>
+    <string name="bft_1">1 Bft: hojas no se mueven</string>
+    <string name="bft_2">2 Bft: hojas empiezan a moverse</string>
+    <string name="bft_3">3 Bft: los banderines empiezan a moverse</string>
+    <string name="bft_4">4 Bft: lasramas pequeñas empiezan a moverse</string>
+    <string name="bft_5">5 Bft: los árboles pequeños se mueven</string>
+    <string name="bft_6">6 Bft: Las grandes ramas se mueven</string>
+    <string name="bft_7">7 Bft: Se mueven los árboles</string>
+    <string name="bft_8">8 Bft: rotura de pequeñas ramas</string>
+    <string name="bft_9">9 Bft: Tormenta con daños</string>
+    <string name="front">de frente</string>
+    <string name="back">de espalda</string>
+    <string name="left">desde la izquierda</string>
+    <string name="right">de la derecha</string>
+    <string name="left_front">de delantero izquierdo</string>
+    <string name="right_front">de delantero derecho</string>
+    <string name="left_back">de la parte posterior izquierda</string>
+    <string name="right_back">de derecha trasera</string>
+    <string name="stop">Stop</string>
+    <string name="end_n">%d entrada</string>
+    <string name="miss">Perdida</string>
+    <string name="backspace">Atras</string>
+    <string name="accessibility_description_shot_n_score">Tiro %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d rondas</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d flechas</item>
+        <item quantity="other">%1$d \u00D7 %2$d flechas</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">flecha %d por entrada</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-es/target_faces.xml b/shared/src/main/res/values-es/target_faces.xml
index 359139344..ca9f85120 100644
--- a/shared/src/main/res/values-es/target_faces.xml
+++ b/shared/src/main/res/values-es/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Campo</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA completo</string>
-  <string name="wa_6_ring">WA 6 anillos</string>
-  <string name="wa_5_ring">WA 5 anillos</string>
-  <string name="wa_3_ring">WA 3 anillos</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">Triple Vertical</string>
-  <string name="wa_3_ring_3_spot">WA 3 Anillos 3 Spot</string>
-  <string name="nfaa_field">NFAA campo</string>
-  <string name="nfaa_expert_field">NFAA Campo experto</string>
-  <string name="nfaa_hunter">NFAA cazador</string>
-  <string name="nfaa_indoor">NFAA interior</string>
-  <string name="nfaa_indoor_5_spot">NFAA 5 Spot Indoor</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Campo</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS campo</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Campo 3 Anillos</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Anillos</string>
-  <string name="wa_danage_6_spot">WA Danage 6 anillos</string>
-  <string name="dbsc_blowpipe">DBSC cerbatana</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">Color FCFS (invertido 10 – 1)</string>
-  <string name="recurve_style_x_1">Estilo recurvo (X-1)</string>
-  <string name="recurve_style_10_1">Estilo recurvo (10-1)</string>
-  <string name="recurve_style_x_5">Estilo recurvo (X-5)</string>
-  <string name="recurve_style_10_5">Estilo recurvo (10-5)</string>
-  <string name="recurve_style_x_6">Estilo recurvo (X-6)</string>
-  <string name="recurve_style_10_6">Estilo recurvo (10-6)</string>
-  <string name="recurve_style_x_8">Estilo recurvo (X-8)</string>
-  <string name="recurve_style_10_8">Estilo recurvo (10-8)</string>
-  <string name="compound_style">Estilo compuesto</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Campo</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA completo</string>
+    <string name="wa_6_ring">WA 6 anillos</string>
+    <string name="wa_5_ring">WA 5 anillos</string>
+    <string name="wa_3_ring">WA 3 anillos</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">Triple Vertical</string>
+    <string name="wa_3_ring_3_spot">WA 3 Anillos 3 Spot</string>
+    <string name="nfaa_field">NFAA campo</string>
+    <string name="nfaa_expert_field">NFAA Campo experto</string>
+    <string name="nfaa_hunter">NFAA cazador</string>
+    <string name="nfaa_indoor">NFAA interior</string>
+    <string name="nfaa_indoor_5_spot">NFAA 5 Spot Indoor</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Campo</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS campo</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Campo 3 Anillos</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Anillos</string>
+    <string name="wa_danage_6_spot">WA Danage 6 anillos</string>
+    <string name="dbsc_blowpipe">DBSC cerbatana</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">Color FCFS (invertido 10 – 1)</string>
+    <string name="recurve_style_x_1">Estilo recurvo (X-1)</string>
+    <string name="recurve_style_10_1">Estilo recurvo (10-1)</string>
+    <string name="recurve_style_x_5">Estilo recurvo (X-5)</string>
+    <string name="recurve_style_10_5">Estilo recurvo (10-5)</string>
+    <string name="recurve_style_x_6">Estilo recurvo (X-6)</string>
+    <string name="recurve_style_10_6">Estilo recurvo (10-6)</string>
+    <string name="recurve_style_x_8">Estilo recurvo (X-8)</string>
+    <string name="recurve_style_10_8">Estilo recurvo (10-8)</string>
+    <string name="compound_style">Estilo compuesto</string>
 </resources>
diff --git a/shared/src/main/res/values-et/rounds.xml b/shared/src/main/res/values-et/rounds.xml
index 760a35643..f1c755800 100644
--- a/shared/src/main/res/values-et/rounds.xml
+++ b/shared/src/main/res/values-et/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Austraalia kombineeritud siselaskmine</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Austraalia kombineeritud siselaskmine</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-et/strings.xml b/shared/src/main/res/values-et/strings.xml
index 5ecaeefc4..64cc33443 100644
--- a/shared/src/main/res/values-et/strings.xml
+++ b/shared/src/main/res/values-et/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">recurve vibu</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">recurve vibu</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d × %3$d nooled (%4$s)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Möödalask</string>
+    <string name="backspace">Tagasisammuklahv</string>
+    <string name="accessibility_description_shot_n_score">%1$d lask %2$s-st</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-et/target_faces.xml b/shared/src/main/res/values-et/target_faces.xml
index 645864faa..ed4a12f45 100644
--- a/shared/src/main/res/values-et/target_faces.xml
+++ b/shared/src/main/res/values-et/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Tavapärane</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Tavapärane</string>
+    <string name="target_type_field_archery">Väli</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">Täis WA</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3-х</string>
+    <string name="vertical_3_spot">WA vertikaalne 3-х</string>
+    <string name="wa_3_ring_3_spot">WA 3 ring 3-х</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5-х</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Tulemus või puudumine</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA periood</string>
+    <string name="wa_field_3_spot">WA kahevärviline 3-х</string>
+    <string name="wa_danage_3_spot">WA Danage 3-х</string>
+    <string name="wa_danage_6_spot">WA Danage 6-х</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS-värv (tagurpidi 10–1)</string>
+    <string name="recurve_style_x_1">Klassikaline stiil (X–1)</string>
+    <string name="recurve_style_10_1">Klassikaline stiil (10–1)</string>
+    <string name="recurve_style_x_5">Klassikaline stiil (X–5)</string>
+    <string name="recurve_style_10_5">Klassikaline stiil (10–5)</string>
+    <string name="recurve_style_x_6">Klassikaline stiil (X–6)</string>
+    <string name="recurve_style_10_6">Klassikaline stiil (10–6)</string>
+    <string name="recurve_style_x_8">Klassikaline stiil (X–8)</string>
+    <string name="recurve_style_10_8">Klassikaline stiil (10–8)</string>
+    <string name="compound_style">Kombineeritud stiil</string>
 </resources>
diff --git a/shared/src/main/res/values-fi/rounds.xml b/shared/src/main/res/values-fi/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-fi/rounds.xml
+++ b/shared/src/main/res/values-fi/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-fi/strings.xml b/shared/src/main/res/values-fi/strings.xml
index 7b8c04ef1..a07db414a 100644
--- a/shared/src/main/res/values-fi/strings.xml
+++ b/shared/src/main/res/values-fi/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-fi/target_faces.xml b/shared/src/main/res/values-fi/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-fi/target_faces.xml
+++ b/shared/src/main/res/values-fi/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-fr/rounds.xml b/shared/src/main/res/values-fr/rounds.xml
index 0482da82e..658c0805f 100644
--- a/shared/src/main/res/values-fr/rounds.xml
+++ b/shared/src/main/res/values-fr/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australien Combiné Salle</string>
-  <string name="australian_indoor_1">Australien Salle 1</string>
-  <string name="australian_indoor_2">Australien Salle 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18m (40cm)</string>
-  <string name="wa_18_60cm">WA 18m (60cm)</string>
-  <string name="wa_3_spot">WA Trispot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA combiné</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Salle : Adulte/Jeune</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Salle : Enfant</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Enfant</string>
-  <string name="flint_bowman_indoor">Flint Bowman Salle</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individuel Poulies Élimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individuel Poulies Élimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individuel Poulies Élimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Classique Élimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Classique Élimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Classique Élimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Classique Élimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 cadets hommes</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadette femme</string>
-  <string name="wa_compound_individual">WA Poulies Individuel</string>
-  <string name="wa_compound_qualification">WA Classique Qualification</string>
-  <string name="wa_cub">WA Enfant</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Manche olympique</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior hommes</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior femmes</string>
-  <string name="wa_1440_men_master_50">WA 1440 Hommes Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Homme Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Homme Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 hommes Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Femmes Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Femmes Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Femmes Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 femmes Senior</string>
-  <string name="half_wa_1440_cadet_men">Demi WA 1440 Cadet Hommes</string>
-  <string name="half_wa_1440_cadet_women">Demi WA 1440 Cadet femmes</string>
-  <string name="half_wa_1440_junior_men">Demi WA 1440 Junior Homme</string>
-  <string name="half_wa_1440_junior_women">Demi WA 1440 Junior femmes</string>
-  <string name="half_wa_1440_men_master_50">Demi WA 1440 hommes Master 50 +</string>
-  <string name="half_wa_1440_men_master_60">Demi WA 1440 hommes Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Demi WA 1440 hommes Master 70+</string>
-  <string name="half_wa_1440_men_senior">Demi WA 1440 hommes Senior</string>
-  <string name="half_wa_1440_women_master_50">Demi WA 1440 Femmes Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Demi WA 1440 Femmes Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Demi WA 1440 Femmes Master 70+</string>
-  <string name="half_wa_1440_women_senior">Demi WA 1440 Femmes Sénior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Américain</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Junior Court National</string>
-  <string name="short_junior_warwick">Junior Court Warwick</string>
-  <string name="short_junior_western">Junior Court Western</string>
-  <string name="short_junior_windsor">Junior Court Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Court National</string>
-  <string name="short_warwick">Court Warwick</string>
-  <string name="short_western">Court Western</string>
-  <string name="short_windsor">Court Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">Saint-Georges</string>
-  <string name="st_nicholas">Saint-Nicolas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">Nouveau National</string>
-  <string name="new_warwick">Nouveau Warwick</string>
-  <string name="new_western">Nouveau Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Demi Métrique I</string>
-  <string name="half_metric_ii">Demi Métrique II</string>
-  <string name="half_metric_iii">Demi Métrique III</string>
-  <string name="half_metric_iv">Demi Métrique IV</string>
-  <string name="half_metric_v">Demi Métrique V</string>
-  <string name="short_metric_i">Métrique court I</string>
-  <string name="short_metric_ii">Métrique court II</string>
-  <string name="short_metric_iii">Métrique court III</string>
-  <string name="short_metric_iv">Métrique court IV</string>
-  <string name="short_metric_v">Métrique court V</string>
-  <string name="metric_i">Métrique I</string>
-  <string name="metric_ii">Métrique II</string>
-  <string name="metric_iii">Métrique III</string>
-  <string name="metric_iv">Métrique IV</string>
-  <string name="metric_v">Métrique V</string>
-  <string name="long_metric_i">Métrique Long I</string>
-  <string name="long_metric_ii">Métrique Long II</string>
-  <string name="long_metric_iii">Métrique Long III</string>
-  <string name="long_metric_iv">Métrique Long IV</string>
-  <string name="long_metric_v">Métrique Long V</string>
-  <string name="long_metric_gents">Métrique Long (Messieurs)</string>
-  <string name="long_metric_ladies">Métrique Long (dames)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adélaïde</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermédiaire</string>
-  <string name="junior_canberra">Canberra Junior</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Brisbane long</string>
-  <string name="long_sydney">Sydney long</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Adelaïde court</string>
-  <string name="short_canberra">Canberra court</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classique/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classique/Dakota : Enfant</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classique/Dakota : Junior/Jeune</string>
-  <string name="nfaa_600_cub">NFAA 600 : Enfant</string>
-  <string name="nfaa_600_junior">NFAA 600 : junior/jeune</string>
-  <string name="nfaa_810">NFAA/Americain 810</string>
-  <string name="nfaa_810_cub">NFAA/Americain 810 : enfant</string>
-  <string name="nfaa_810_junior">NFAA/Americain810 : Junior/jeune</string>
-  <string name="nfaa_900">NFAA/Americain 900</string>
-  <string name="nfaa_900_cub">NFAA/Americain 900 : Enfant</string>
-  <string name="nfaa_900_junior">NFAA/Americain 900 : Junior/Jeune</string>
-  <string name="canadian_900">Canadiens 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">NFAA Nature 280</string>
-  <string name="ifaa_animal_300">IFAA Nature 300</string>
-  <string name="ifaa_animal_560">IFAA Nature 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Nature 280</string>
-  <string name="nfaa_animal_300">NFAA Nature 300</string>
-  <string name="nfaa_animal_588">NFAA Nature 588</string>
-  <string name="nfaa_lake_of_woods">NFAA lac des bois</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Campagne 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Campagne seulement 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Campagne 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Campagne 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Campagne 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Chasse 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Chasse 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Chasse 300</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Campagne/Chasse 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Campagne 12 inconnues/12 connues : Piquets rouges</string>
-  <string name="wa_field_marked_12_red">Wa Campagne 12 Connues : Piquets rouges</string>
-  <string name="wa_field_marked_24_red">Campagne 24 Connues : Piquets rouges</string>
-  <string name="wa_field_unmarked_12_red">Campagne 12 Inconnues : Piquets rouges</string>
-  <string name="wa_field_unmarked_24_red">Campagne 24 Inconnues : Piquets rouges</string>
-  <string name="wa_field_unmarked_marked_blue">WA Campagne 12 Inconnues/12 Connues : Piquets bleus</string>
-  <string name="wa_field_marked_12_blue">WA Campagne 12 Connues : Piquets Bleus</string>
-  <string name="wa_field_marked_24_blue">WA Campagne 24 Connues : Piquets Bleus</string>
-  <string name="wa_field_unmarked_12_blue">WA Campagne 12 Inconnues : Piquets Bleus</string>
-  <string name="wa_field_unmarked_24_blue">WA Campagne 24 Inconnues : Piquets Bleus</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Campagne 12 Inconnues/12 Connues : Piquets Jaunes</string>
-  <string name="wa_field_marked_12_yellow">WA Campagne 12 Connues : Piquets Jaunes</string>
-  <string name="wa_field_marked_24_yellow">WA Campagne 24 Connues : Piquets Jaunes</string>
-  <string name="wa_field_unmarked_12_yellow">WA Campagne 12 Inconnues : Piquets Jaunes</string>
-  <string name="wa_field_unmarked_24_yellow">WA Campagne 24 Inconnues : Piquets Jaunes</string>
-  <string name="big_game_36">Gros gibier 36</string>
-  <string name="big_game_40">Gros gibier 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australien Combiné Salle</string>
+    <string name="australian_indoor_1">Australien Salle 1</string>
+    <string name="australian_indoor_2">Australien Salle 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18m (40cm)</string>
+    <string name="wa_18_60cm">WA 18m (60cm)</string>
+    <string name="wa_3_spot">WA Trispot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA combiné</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Salle : Adulte/Jeune</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Salle : Enfant</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Enfant</string>
+    <string name="flint_bowman_indoor">Flint Bowman Salle</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individuel Poulies Élimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individuel Poulies Élimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individuel Poulies Élimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Classique Élimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Classique Élimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Classique Élimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Classique Élimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 cadets hommes</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadette femme</string>
+    <string name="wa_compound_individual">WA Poulies Individuel</string>
+    <string name="wa_compound_qualification">WA Classique Qualification</string>
+    <string name="wa_cub">WA Enfant</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Manche olympique</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior hommes</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior femmes</string>
+    <string name="wa_1440_men_master_50">WA 1440 Hommes Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Homme Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Homme Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 hommes Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Femmes Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Femmes Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Femmes Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 femmes Senior</string>
+    <string name="half_wa_1440_cadet_men">Demi WA 1440 Cadet Hommes</string>
+    <string name="half_wa_1440_cadet_women">Demi WA 1440 Cadet femmes</string>
+    <string name="half_wa_1440_junior_men">Demi WA 1440 Junior Homme</string>
+    <string name="half_wa_1440_junior_women">Demi WA 1440 Junior femmes</string>
+    <string name="half_wa_1440_men_master_50">Demi WA 1440 hommes Master 50 +</string>
+    <string name="half_wa_1440_men_master_60">Demi WA 1440 hommes Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Demi WA 1440 hommes Master 70+</string>
+    <string name="half_wa_1440_men_senior">Demi WA 1440 hommes Senior</string>
+    <string name="half_wa_1440_women_master_50">Demi WA 1440 Femmes Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Demi WA 1440 Femmes Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Demi WA 1440 Femmes Master 70+</string>
+    <string name="half_wa_1440_women_senior">Demi WA 1440 Femmes Sénior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Américain</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Junior Court National</string>
+    <string name="short_junior_warwick">Junior Court Warwick</string>
+    <string name="short_junior_western">Junior Court Western</string>
+    <string name="short_junior_windsor">Junior Court Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Court National</string>
+    <string name="short_warwick">Court Warwick</string>
+    <string name="short_western">Court Western</string>
+    <string name="short_windsor">Court Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">Saint-Georges</string>
+    <string name="st_nicholas">Saint-Nicolas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">Nouveau National</string>
+    <string name="new_warwick">Nouveau Warwick</string>
+    <string name="new_western">Nouveau Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Demi Métrique I</string>
+    <string name="half_metric_ii">Demi Métrique II</string>
+    <string name="half_metric_iii">Demi Métrique III</string>
+    <string name="half_metric_iv">Demi Métrique IV</string>
+    <string name="half_metric_v">Demi Métrique V</string>
+    <string name="short_metric_i">Métrique court I</string>
+    <string name="short_metric_ii">Métrique court II</string>
+    <string name="short_metric_iii">Métrique court III</string>
+    <string name="short_metric_iv">Métrique court IV</string>
+    <string name="short_metric_v">Métrique court V</string>
+    <string name="metric_i">Métrique I</string>
+    <string name="metric_ii">Métrique II</string>
+    <string name="metric_iii">Métrique III</string>
+    <string name="metric_iv">Métrique IV</string>
+    <string name="metric_v">Métrique V</string>
+    <string name="long_metric_i">Métrique Long I</string>
+    <string name="long_metric_ii">Métrique Long II</string>
+    <string name="long_metric_iii">Métrique Long III</string>
+    <string name="long_metric_iv">Métrique Long IV</string>
+    <string name="long_metric_v">Métrique Long V</string>
+    <string name="long_metric_gents">Métrique Long (Messieurs)</string>
+    <string name="long_metric_ladies">Métrique Long (dames)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adélaïde</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermédiaire</string>
+    <string name="junior_canberra">Canberra Junior</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Brisbane long</string>
+    <string name="long_sydney">Sydney long</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Adelaïde court</string>
+    <string name="short_canberra">Canberra court</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classique/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classique/Dakota : Enfant</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classique/Dakota : Junior/Jeune</string>
+    <string name="nfaa_600_cub">NFAA 600 : Enfant</string>
+    <string name="nfaa_600_junior">NFAA 600 : junior/jeune</string>
+    <string name="nfaa_810">NFAA/Americain 810</string>
+    <string name="nfaa_810_cub">NFAA/Americain 810 : enfant</string>
+    <string name="nfaa_810_junior">NFAA/Americain810 : Junior/jeune</string>
+    <string name="nfaa_900">NFAA/Americain 900</string>
+    <string name="nfaa_900_cub">NFAA/Americain 900 : Enfant</string>
+    <string name="nfaa_900_junior">NFAA/Americain 900 : Junior/Jeune</string>
+    <string name="canadian_900">Canadiens 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">NFAA Nature 280</string>
+    <string name="ifaa_animal_300">IFAA Nature 300</string>
+    <string name="ifaa_animal_560">IFAA Nature 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Nature 280</string>
+    <string name="nfaa_animal_300">NFAA Nature 300</string>
+    <string name="nfaa_animal_588">NFAA Nature 588</string>
+    <string name="nfaa_lake_of_woods">NFAA lac des bois</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Campagne 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Campagne seulement 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Campagne 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Campagne 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Campagne 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Chasse 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Chasse 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Chasse 300</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Campagne/Chasse 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Campagne 12 inconnues/12 connues : Piquets rouges</string>
+    <string name="wa_field_marked_12_red">Wa Campagne 12 Connues : Piquets rouges</string>
+    <string name="wa_field_marked_24_red">Campagne 24 Connues : Piquets rouges</string>
+    <string name="wa_field_unmarked_12_red">Campagne 12 Inconnues : Piquets rouges</string>
+    <string name="wa_field_unmarked_24_red">Campagne 24 Inconnues : Piquets rouges</string>
+    <string name="wa_field_unmarked_marked_blue">WA Campagne 12 Inconnues/12 Connues : Piquets bleus</string>
+    <string name="wa_field_marked_12_blue">WA Campagne 12 Connues : Piquets Bleus</string>
+    <string name="wa_field_marked_24_blue">WA Campagne 24 Connues : Piquets Bleus</string>
+    <string name="wa_field_unmarked_12_blue">WA Campagne 12 Inconnues : Piquets Bleus</string>
+    <string name="wa_field_unmarked_24_blue">WA Campagne 24 Inconnues : Piquets Bleus</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Campagne 12 Inconnues/12 Connues : Piquets Jaunes</string>
+    <string name="wa_field_marked_12_yellow">WA Campagne 12 Connues : Piquets Jaunes</string>
+    <string name="wa_field_marked_24_yellow">WA Campagne 24 Connues : Piquets Jaunes</string>
+    <string name="wa_field_unmarked_12_yellow">WA Campagne 12 Inconnues : Piquets Jaunes</string>
+    <string name="wa_field_unmarked_24_yellow">WA Campagne 24 Inconnues : Piquets Jaunes</string>
+    <string name="big_game_36">Gros gibier 36</string>
+    <string name="big_game_40">Gros gibier 40</string>
 </resources>
diff --git a/shared/src/main/res/values-fr/strings.xml b/shared/src/main/res/values-fr/strings.xml
index e23678907..1e6f18340 100644
--- a/shared/src/main/res/values-fr/strings.xml
+++ b/shared/src/main/res/values-fr/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arc classique</string>
-  <string name="compound_bow">Arc à poulies</string>
-  <string name="bare_bow">Arc nu</string>
-  <string name="long_bow">Arc long</string>
-  <string name="horse_bow">Arc à cheval</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Ensoleillé</string>
-  <string name="partly_cloudy">Partiellement nuageux</string>
-  <string name="cloudy">Nuageux</string>
-  <string name="light_rain">Légère pluie</string>
-  <string name="rain">Pluvieux</string>
-  <string name="round_desc">%1$s: %2$d × %3$d flèches (blason %4$s)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Petit</string>
-  <string name="medium">Moyen</string>
-  <string name="large">Grand</string>
-  <string name="xlarge">Très grand</string>
-  <string name="unknown">Inconnu</string>
-  <string name="indoor">En salle</string>
-  <string name="wind">Vent</string>
-  <string name="location">Lieu</string>
-  <string name="bft_0">0 Bf : Absence de vent</string>
-  <string name="bft_1">1 Bf : Les feuilles ne bougent pas</string>
-  <string name="bft_2">2 Bf : Les feuilles commencent à bouger</string>
-  <string name="bft_3">3 Bf : Les drapeaux légers commencent à bouger</string>
-  <string name="bft_4">4 Bf : Les petites branches commencent à bouger</string>
-  <string name="bft_5">5 Bf : Les petits arbres bougent</string>
-  <string name="bft_6">6 Bf : Les grosses branches bougent</string>
-  <string name="bft_7">7 Bf : Tous les arbres balancent</string>
-  <string name="bft_8">8 Bf : Les petites branches cassent</string>
-  <string name="bft_9">9 Bf : Dégâts de tempête</string>
-  <string name="front">de devant</string>
-  <string name="back">de derrière</string>
-  <string name="left">de la gauche</string>
-  <string name="right">de la droite</string>
-  <string name="left_front">de l\'avant gauche</string>
-  <string name="right_front">de l\'avant droit</string>
-  <string name="left_back">de l\'arrière gauche</string>
-  <string name="right_back">de l\'arrière droit</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Volée %d</string>
-  <string name="miss">Manqué</string>
-  <string name="backspace">Retour en arrière</string>
-  <string name="accessibility_description_shot_n_score">Tir %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d série</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d flèche</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d flèche par volée</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Arc classique</string>
+    <string name="compound_bow">Arc à poulies</string>
+    <string name="bare_bow">Arc nu</string>
+    <string name="long_bow">Arc long</string>
+    <string name="horse_bow">Arc à cheval</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Ensoleillé</string>
+    <string name="partly_cloudy">Partiellement nuageux</string>
+    <string name="cloudy">Nuageux</string>
+    <string name="light_rain">Légère pluie</string>
+    <string name="rain">Pluvieux</string>
+    <string name="round_desc">%1$s: %2$d × %3$d flèches (blason %4$s)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Petit</string>
+    <string name="medium">Moyen</string>
+    <string name="large">Grand</string>
+    <string name="xlarge">Très grand</string>
+    <string name="unknown">Inconnu</string>
+    <string name="indoor">En salle</string>
+    <string name="wind">Vent</string>
+    <string name="location">Lieu</string>
+    <string name="bft_0">0 Bf : Absence de vent</string>
+    <string name="bft_1">1 Bf : Les feuilles ne bougent pas</string>
+    <string name="bft_2">2 Bf : Les feuilles commencent à bouger</string>
+    <string name="bft_3">3 Bf : Les drapeaux légers commencent à bouger</string>
+    <string name="bft_4">4 Bf : Les petites branches commencent à bouger</string>
+    <string name="bft_5">5 Bf : Les petits arbres bougent</string>
+    <string name="bft_6">6 Bf : Les grosses branches bougent</string>
+    <string name="bft_7">7 Bf : Tous les arbres balancent</string>
+    <string name="bft_8">8 Bf : Les petites branches cassent</string>
+    <string name="bft_9">9 Bf : Dégâts de tempête</string>
+    <string name="front">de devant</string>
+    <string name="back">de derrière</string>
+    <string name="left">de la gauche</string>
+    <string name="right">de la droite</string>
+    <string name="left_front">de l\'avant gauche</string>
+    <string name="right_front">de l\'avant droit</string>
+    <string name="left_back">de l\'arrière gauche</string>
+    <string name="right_back">de l\'arrière droit</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Volée %d</string>
+    <string name="miss">Manqué</string>
+    <string name="backspace">Retour en arrière</string>
+    <string name="accessibility_description_shot_n_score">Tir %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d série</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d flèche</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d flèche par volée</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-fr/target_faces.xml b/shared/src/main/res/values-fr/target_faces.xml
index 187c0dc81..ec3e8b3e4 100644
--- a/shared/src/main/res/values-fr/target_faces.xml
+++ b/shared/src/main/res/values-fr/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Normal</string>
-  <string name="target_type_field_archery">Campagne</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA complet</string>
-  <string name="wa_6_ring">WA 6 anneaux</string>
-  <string name="wa_5_ring">WA 5 anneaux</string>
-  <string name="wa_3_ring">WA 3 anneaux</string>
-  <string name="vegas_3_spot">Vegas trispots</string>
-  <string name="vertical_3_spot">WA trispot vertical</string>
-  <string name="wa_3_ring_3_spot">WA trispots 3 anneaux</string>
-  <string name="nfaa_field">NFAA Campagne</string>
-  <string name="nfaa_expert_field">NFAA Campagne Expert</string>
-  <string name="nfaa_hunter">NFAA Chasse</string>
-  <string name="nfaa_indoor">NFAA Salle</string>
-  <string name="nfaa_indoor_5_spot">NFAA Salle 5 Spots</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Campagne</string>
-  <string name="hit_or_miss">Touché ou manqué</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Nature</string>
-  <string name="nfaa_animal">NFAA Nature</string>
-  <string name="nfas_field">NFAS Campagne</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA trispot campagne</string>
-  <string name="wa_danage_3_spot">WA tri spot pour l\'entrainement</string>
-  <string name="wa_danage_6_spot">WA 6 spot pour l\'entrainement</string>
-  <string name="dbsc_blowpipe">DBSC sarbacane</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">Couleur de FCFS (inversé 10 – 1)</string>
-  <string name="recurve_style_x_1">Style classique (X-1)</string>
-  <string name="recurve_style_10_1">Style classique (10-1)</string>
-  <string name="recurve_style_x_5">Style classique (X-5)</string>
-  <string name="recurve_style_10_5">Style classique (10-5)</string>
-  <string name="recurve_style_x_6">Style classique (X-6)</string>
-  <string name="recurve_style_10_6">Style classique (10-6)</string>
-  <string name="recurve_style_x_8">Style classique (X-8)</string>
-  <string name="recurve_style_10_8">Style classique (10-8)</string>
-  <string name="compound_style">Style poulies</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Normal</string>
+    <string name="target_type_field_archery">Campagne</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA complet</string>
+    <string name="wa_6_ring">WA 6 anneaux</string>
+    <string name="wa_5_ring">WA 5 anneaux</string>
+    <string name="wa_3_ring">WA 3 anneaux</string>
+    <string name="vegas_3_spot">Vegas trispots</string>
+    <string name="vertical_3_spot">WA trispot vertical</string>
+    <string name="wa_3_ring_3_spot">WA trispots 3 anneaux</string>
+    <string name="nfaa_field">NFAA Campagne</string>
+    <string name="nfaa_expert_field">NFAA Campagne Expert</string>
+    <string name="nfaa_hunter">NFAA Chasse</string>
+    <string name="nfaa_indoor">NFAA Salle</string>
+    <string name="nfaa_indoor_5_spot">NFAA Salle 5 Spots</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Campagne</string>
+    <string name="hit_or_miss">Touché ou manqué</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Nature</string>
+    <string name="nfaa_animal">NFAA Nature</string>
+    <string name="nfas_field">NFAS Campagne</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA trispot campagne</string>
+    <string name="wa_danage_3_spot">WA tri spot pour l\'entrainement</string>
+    <string name="wa_danage_6_spot">WA 6 spot pour l\'entrainement</string>
+    <string name="dbsc_blowpipe">DBSC sarbacane</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">Couleur de FCFS (inversé 10 – 1)</string>
+    <string name="recurve_style_x_1">Style classique (X-1)</string>
+    <string name="recurve_style_10_1">Style classique (10-1)</string>
+    <string name="recurve_style_x_5">Style classique (X-5)</string>
+    <string name="recurve_style_10_5">Style classique (10-5)</string>
+    <string name="recurve_style_x_6">Style classique (X-6)</string>
+    <string name="recurve_style_10_6">Style classique (10-6)</string>
+    <string name="recurve_style_x_8">Style classique (X-8)</string>
+    <string name="recurve_style_10_8">Style classique (10-8)</string>
+    <string name="compound_style">Style poulies</string>
 </resources>
diff --git a/shared/src/main/res/values-hu/rounds.xml b/shared/src/main/res/values-hu/rounds.xml
index d7b3e1811..a41060428 100644
--- a/shared/src/main/res/values-hu/rounds.xml
+++ b/shared/src/main/res/values-hu/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Ausztrál kombinált teremben</string>
-  <string name="australian_indoor_1">Ausztrál teremben 1</string>
-  <string name="australian_indoor_2">Ausztrál teremben 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 szűkített</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Kombinált</string>
-  <string name="match_round">Fordulós mérkőzés</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 fedett: felnőtt és ifjúsági</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 fedett: gyerek</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: gyerek</string>
-  <string name="flint_bowman_indoor">Flint Gyerek fedett</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA egyéni csigás selejtező 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA egyéni csigás selejtező 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA egyéni csigás selejtező 50m</string>
-  <string name="wa_recurve_elimination_18">WA reflex selejtező 18m</string>
-  <string name="wa_recurve_elimination_50">WA reflex selejtező 50m</string>
-  <string name="wa_recurve_elimination_60">WA reflex selejtező 60m</string>
-  <string name="wa_recurve_elimination_70">WA reflex selejtező 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Gyerek</string>
-  <string name="wa_1440_cadet_men">WA 1440 Kadet férfiak</string>
-  <string name="wa_1440_cadet_women">WA 1440 Kadet nők</string>
-  <string name="wa_compound_individual">WA csigás egyéni</string>
-  <string name="wa_compound_qualification">WA csigás kavalifikációs</string>
-  <string name="wa_cub">WA Serdülő</string>
-  <string name="wa_standard">WA Szabványos</string>
-  <string name="olympic_round">Olimpiai forduló</string>
-  <string name="wa_1440_junior_men">WA 1440 Ifijúsági férfiak</string>
-  <string name="wa_1440_junior_women">WA 1440 Ifijúsági nők</string>
-  <string name="wa_1440_men_master_50">WA 1440 férfiak mester 50 +</string>
-  <string name="wa_1440_men_master_60">WA 1440 férfiak mester 60 +</string>
-  <string name="wa_1440_men_master_70">WA 1440 férfiak mester 70 +</string>
-  <string name="wa_1440_men_senior">WA 1440 férfiak senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 nők mester 50 +</string>
-  <string name="wa_1440_women_master_60">WA 1440 nők mester 60 +</string>
-  <string name="wa_1440_women_master_70">WA 1440 nők mester 70 +</string>
-  <string name="wa_1440_women_senior">WA 1440 nők senior</string>
-  <string name="half_wa_1440_cadet_men">Fél WA 1440 Kadet férfi</string>
-  <string name="half_wa_1440_cadet_women">Fél WA 1440 Kadet nők</string>
-  <string name="half_wa_1440_junior_men">Fél WA 1440 Junior férfi</string>
-  <string name="half_wa_1440_junior_women">WA 1440 Ifijúsági nők</string>
-  <string name="half_wa_1440_men_master_50">Fél WA 1440 férfi mester 50 +</string>
-  <string name="half_wa_1440_men_master_60">Fél WA 1440 férfi mester 60 +</string>
-  <string name="half_wa_1440_men_master_70">Fél WA 1440 férfi mester 70 +</string>
-  <string name="half_wa_1440_men_senior">Fél WA 1440 férfiak senior</string>
-  <string name="half_wa_1440_women_master_50">Fél WA 1440 nők mester 50 +</string>
-  <string name="half_wa_1440_women_master_60">Fél WA 1440 nők mester 60 +</string>
-  <string name="half_wa_1440_women_master_70">Fél WA 1440 nők mester 70 +</string>
-  <string name="half_wa_1440_women_senior">Fél WA 1440 nők senior</string>
-  <string name="wa_double_720_30_80cm">WA kettős 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA kettős 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA kettős 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA kettős 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA kettős 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA kettős 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA kettős 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Amerikai</string>
-  <string name="bristol_i">Bristol I.</string>
-  <string name="bristol_ii">Bristol II.</string>
-  <string name="bristol_iii">Bristol III.</string>
-  <string name="bristol_iv">Bristol IV.</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Rövid Ifijúsági nemzeti</string>
-  <string name="short_junior_warwick">Rövid Ifijúsági Warwick</string>
-  <string name="short_junior_western">Rövid Ifijúsági Western</string>
-  <string name="short_junior_windsor">Rövid Ifijúsági Windsor</string>
-  <string name="junior_national">Rövid Ifijúsági nemzeti</string>
-  <string name="junior_warwick">Ifijúsági Warwick</string>
-  <string name="junior_western">Ifijúsági Western</string>
-  <string name="junior_windsor">Ifijúsági Windsor</string>
-  <string name="short_national">Rövid nemzeti</string>
-  <string name="short_warwick">Rövid Warwick</string>
-  <string name="short_western">Rövid Western</string>
-  <string name="short_windsor">Rövid Windsor</string>
-  <string name="national">Nemzeti</string>
-  <string name="st_george">Szent György</string>
-  <string name="st_nicholas">Szent Miklós</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Hosszú nemzeti</string>
-  <string name="long_warwick">Hosszú Warwick</string>
-  <string name="long_western">Hosszú Western</string>
-  <string name="new_national">Új nemzeti</string>
-  <string name="new_warwick">Új Warwick</string>
-  <string name="new_western">Új Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Fél metrikus I</string>
-  <string name="half_metric_ii">Fél metrikus II</string>
-  <string name="half_metric_iii">Fél metrikus III</string>
-  <string name="half_metric_iv">Fél metrikus IV</string>
-  <string name="half_metric_v">Fél metrikus V</string>
-  <string name="short_metric_i">Metrikus rövid I</string>
-  <string name="short_metric_ii">Rövid metrikus II</string>
-  <string name="short_metric_iii">Rövid metrikus III</string>
-  <string name="short_metric_iv">Rövid metrikus IV</string>
-  <string name="short_metric_v">Rövid metrikus V</string>
-  <string name="metric_i">Metrikus I</string>
-  <string name="metric_ii">Metrikus II</string>
-  <string name="metric_iii">Metrikus III</string>
-  <string name="metric_iv">Metrikus IV</string>
-  <string name="metric_v">Metrikus V</string>
-  <string name="long_metric_i">Hosszú metrikus I</string>
-  <string name="long_metric_ii">Hosszú metrikus II</string>
-  <string name="long_metric_iii">Hosszú metrikus III</string>
-  <string name="long_metric_iv">Hosszú metrikus IV</string>
-  <string name="long_metric_v">Hosszú metrikus V</string>
-  <string name="long_metric_gents">Hosszú metrikus (urak)</string>
-  <string name="long_metric_ladies">Hosszú metrikus (nők)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Középhaladó</string>
-  <string name="junior_canberra">Ifijúsági Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Hosszú Brisbane</string>
-  <string name="long_sydney">Hosszú Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Rövid Adelaide</string>
-  <string name="short_canberra">Rövid Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 klasszikus/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 klasszikus/Dakota: gyerek</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 klasszikus/Dakota: Junior és ifjúsági</string>
-  <string name="nfaa_600_cub">NFAA 600: Serdülő</string>
-  <string name="nfaa_600_junior">NFAA 600: Ifjúsági</string>
-  <string name="nfaa_810">NFAA-amerikai 810</string>
-  <string name="nfaa_810_cub">NFAA-amerikai 810: gyerek</string>
-  <string name="nfaa_810_junior">NFAA-amerikai 810: Ifjúsági</string>
-  <string name="nfaa_900">NFAA-amerikai 900</string>
-  <string name="nfaa_900_cub">NFAA-amerikai 900: gyerek</string>
-  <string name="nfaa_900_junior">NFAA-amerikai 900: Ifijúsági</string>
-  <string name="canadian_900">Kanadai 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA állat 280</string>
-  <string name="ifaa_animal_300">IFAA állat 300</string>
-  <string name="ifaa_animal_560">IFAA állat 500</string>
-  <string name="nfaa_international_150">NFAA/IFAA nemzetközi 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA nemzetközi 300</string>
-  <string name="nfaa_animal_280">NFAA állat 280</string>
-  <string name="nfaa_animal_300">NFAA állat 300</string>
-  <string name="nfaa_animal_588">NFAA állat 588</string>
-  <string name="nfaa_lake_of_woods">NFAA tó az erdőben</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Mester terep 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Mester terep csak 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA terep 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA terep 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA terep 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA vadász 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA vadász 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA vadász 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA terep/vadász 560</string>
-  <string name="wa_field_unmarked_marked_red">WA terep 12 jelöletlen/12 megjelölve: Piros pontok</string>
-  <string name="wa_field_marked_12_red">WA terep jelölt 12: Piros pontok</string>
-  <string name="wa_field_marked_24_red">WA terep jelölt 24: Piros pontok</string>
-  <string name="wa_field_unmarked_12_red">WA terep jelöletlen 12: Piros foltok</string>
-  <string name="wa_field_unmarked_24_red">WA terep jelöltlen 12: Piros foltok</string>
-  <string name="wa_field_unmarked_marked_blue">WA terep 12 jelöletlen/12 megjelölve: Kék foltok</string>
-  <string name="wa_field_marked_12_blue">WA terep jelölt 12: Kék foltok</string>
-  <string name="wa_field_marked_24_blue">WA terep jelölt 12: Kék foltok</string>
-  <string name="wa_field_unmarked_12_blue">WA terep jelöletlen 12: Kék foltok</string>
-  <string name="wa_field_unmarked_24_blue">WA terep jelöletlen 12: Kék foltok</string>
-  <string name="wa_field_unmarked_marked_yellow">WA terep 12 jelöletlen/12 megjelölve: Sárga foltok</string>
-  <string name="wa_field_marked_12_yellow">WA terep jelölt 12: Sárga foltok</string>
-  <string name="wa_field_marked_24_yellow">WA terep jelölt 24: Sárga foltok</string>
-  <string name="wa_field_unmarked_12_yellow">WA terep jelöletlen 12: Sárga foltok</string>
-  <string name="wa_field_unmarked_24_yellow">WA terep jelöletlen 24: Sárga foltok</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Ausztrál kombinált teremben</string>
+    <string name="australian_indoor_1">Ausztrál teremben 1</string>
+    <string name="australian_indoor_2">Ausztrál teremben 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 szűkített</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Kombinált</string>
+    <string name="match_round">Fordulós mérkőzés</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 fedett: felnőtt és ifjúsági</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 fedett: gyerek</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: gyerek</string>
+    <string name="flint_bowman_indoor">Flint Gyerek fedett</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA egyéni csigás selejtező 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA egyéni csigás selejtező 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA egyéni csigás selejtező 50m</string>
+    <string name="wa_recurve_elimination_18">WA reflex selejtező 18m</string>
+    <string name="wa_recurve_elimination_50">WA reflex selejtező 50m</string>
+    <string name="wa_recurve_elimination_60">WA reflex selejtező 60m</string>
+    <string name="wa_recurve_elimination_70">WA reflex selejtező 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Gyerek</string>
+    <string name="wa_1440_cadet_men">WA 1440 Kadet férfiak</string>
+    <string name="wa_1440_cadet_women">WA 1440 Kadet nők</string>
+    <string name="wa_compound_individual">WA csigás egyéni</string>
+    <string name="wa_compound_qualification">WA csigás kavalifikációs</string>
+    <string name="wa_cub">WA Serdülő</string>
+    <string name="wa_standard">WA Szabványos</string>
+    <string name="olympic_round">Olimpiai forduló</string>
+    <string name="wa_1440_junior_men">WA 1440 Ifijúsági férfiak</string>
+    <string name="wa_1440_junior_women">WA 1440 Ifijúsági nők</string>
+    <string name="wa_1440_men_master_50">WA 1440 férfiak mester 50 +</string>
+    <string name="wa_1440_men_master_60">WA 1440 férfiak mester 60 +</string>
+    <string name="wa_1440_men_master_70">WA 1440 férfiak mester 70 +</string>
+    <string name="wa_1440_men_senior">WA 1440 férfiak senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 nők mester 50 +</string>
+    <string name="wa_1440_women_master_60">WA 1440 nők mester 60 +</string>
+    <string name="wa_1440_women_master_70">WA 1440 nők mester 70 +</string>
+    <string name="wa_1440_women_senior">WA 1440 nők senior</string>
+    <string name="half_wa_1440_cadet_men">Fél WA 1440 Kadet férfi</string>
+    <string name="half_wa_1440_cadet_women">Fél WA 1440 Kadet nők</string>
+    <string name="half_wa_1440_junior_men">Fél WA 1440 Junior férfi</string>
+    <string name="half_wa_1440_junior_women">WA 1440 Ifijúsági nők</string>
+    <string name="half_wa_1440_men_master_50">Fél WA 1440 férfi mester 50 +</string>
+    <string name="half_wa_1440_men_master_60">Fél WA 1440 férfi mester 60 +</string>
+    <string name="half_wa_1440_men_master_70">Fél WA 1440 férfi mester 70 +</string>
+    <string name="half_wa_1440_men_senior">Fél WA 1440 férfiak senior</string>
+    <string name="half_wa_1440_women_master_50">Fél WA 1440 nők mester 50 +</string>
+    <string name="half_wa_1440_women_master_60">Fél WA 1440 nők mester 60 +</string>
+    <string name="half_wa_1440_women_master_70">Fél WA 1440 nők mester 70 +</string>
+    <string name="half_wa_1440_women_senior">Fél WA 1440 nők senior</string>
+    <string name="wa_double_720_30_80cm">WA kettős 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA kettős 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA kettős 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA kettős 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA kettős 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA kettős 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA kettős 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Amerikai</string>
+    <string name="bristol_i">Bristol I.</string>
+    <string name="bristol_ii">Bristol II.</string>
+    <string name="bristol_iii">Bristol III.</string>
+    <string name="bristol_iv">Bristol IV.</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Rövid Ifijúsági nemzeti</string>
+    <string name="short_junior_warwick">Rövid Ifijúsági Warwick</string>
+    <string name="short_junior_western">Rövid Ifijúsági Western</string>
+    <string name="short_junior_windsor">Rövid Ifijúsági Windsor</string>
+    <string name="junior_national">Rövid Ifijúsági nemzeti</string>
+    <string name="junior_warwick">Ifijúsági Warwick</string>
+    <string name="junior_western">Ifijúsági Western</string>
+    <string name="junior_windsor">Ifijúsági Windsor</string>
+    <string name="short_national">Rövid nemzeti</string>
+    <string name="short_warwick">Rövid Warwick</string>
+    <string name="short_western">Rövid Western</string>
+    <string name="short_windsor">Rövid Windsor</string>
+    <string name="national">Nemzeti</string>
+    <string name="st_george">Szent György</string>
+    <string name="st_nicholas">Szent Miklós</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Hosszú nemzeti</string>
+    <string name="long_warwick">Hosszú Warwick</string>
+    <string name="long_western">Hosszú Western</string>
+    <string name="new_national">Új nemzeti</string>
+    <string name="new_warwick">Új Warwick</string>
+    <string name="new_western">Új Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Fél metrikus I</string>
+    <string name="half_metric_ii">Fél metrikus II</string>
+    <string name="half_metric_iii">Fél metrikus III</string>
+    <string name="half_metric_iv">Fél metrikus IV</string>
+    <string name="half_metric_v">Fél metrikus V</string>
+    <string name="short_metric_i">Metrikus rövid I</string>
+    <string name="short_metric_ii">Rövid metrikus II</string>
+    <string name="short_metric_iii">Rövid metrikus III</string>
+    <string name="short_metric_iv">Rövid metrikus IV</string>
+    <string name="short_metric_v">Rövid metrikus V</string>
+    <string name="metric_i">Metrikus I</string>
+    <string name="metric_ii">Metrikus II</string>
+    <string name="metric_iii">Metrikus III</string>
+    <string name="metric_iv">Metrikus IV</string>
+    <string name="metric_v">Metrikus V</string>
+    <string name="long_metric_i">Hosszú metrikus I</string>
+    <string name="long_metric_ii">Hosszú metrikus II</string>
+    <string name="long_metric_iii">Hosszú metrikus III</string>
+    <string name="long_metric_iv">Hosszú metrikus IV</string>
+    <string name="long_metric_v">Hosszú metrikus V</string>
+    <string name="long_metric_gents">Hosszú metrikus (urak)</string>
+    <string name="long_metric_ladies">Hosszú metrikus (nők)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Középhaladó</string>
+    <string name="junior_canberra">Ifijúsági Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Hosszú Brisbane</string>
+    <string name="long_sydney">Hosszú Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Rövid Adelaide</string>
+    <string name="short_canberra">Rövid Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 klasszikus/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 klasszikus/Dakota: gyerek</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 klasszikus/Dakota: Junior és ifjúsági</string>
+    <string name="nfaa_600_cub">NFAA 600: Serdülő</string>
+    <string name="nfaa_600_junior">NFAA 600: Ifjúsági</string>
+    <string name="nfaa_810">NFAA-amerikai 810</string>
+    <string name="nfaa_810_cub">NFAA-amerikai 810: gyerek</string>
+    <string name="nfaa_810_junior">NFAA-amerikai 810: Ifjúsági</string>
+    <string name="nfaa_900">NFAA-amerikai 900</string>
+    <string name="nfaa_900_cub">NFAA-amerikai 900: gyerek</string>
+    <string name="nfaa_900_junior">NFAA-amerikai 900: Ifijúsági</string>
+    <string name="canadian_900">Kanadai 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA állat 280</string>
+    <string name="ifaa_animal_300">IFAA állat 300</string>
+    <string name="ifaa_animal_560">IFAA állat 500</string>
+    <string name="nfaa_international_150">NFAA/IFAA nemzetközi 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA nemzetközi 300</string>
+    <string name="nfaa_animal_280">NFAA állat 280</string>
+    <string name="nfaa_animal_300">NFAA állat 300</string>
+    <string name="nfaa_animal_588">NFAA állat 588</string>
+    <string name="nfaa_lake_of_woods">NFAA tó az erdőben</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Mester terep 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Mester terep csak 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA terep 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA terep 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA terep 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA vadász 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA vadász 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA vadász 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA terep/vadász 560</string>
+    <string name="wa_field_unmarked_marked_red">WA terep 12 jelöletlen/12 megjelölve: Piros pontok</string>
+    <string name="wa_field_marked_12_red">WA terep jelölt 12: Piros pontok</string>
+    <string name="wa_field_marked_24_red">WA terep jelölt 24: Piros pontok</string>
+    <string name="wa_field_unmarked_12_red">WA terep jelöletlen 12: Piros foltok</string>
+    <string name="wa_field_unmarked_24_red">WA terep jelöltlen 12: Piros foltok</string>
+    <string name="wa_field_unmarked_marked_blue">WA terep 12 jelöletlen/12 megjelölve: Kék foltok</string>
+    <string name="wa_field_marked_12_blue">WA terep jelölt 12: Kék foltok</string>
+    <string name="wa_field_marked_24_blue">WA terep jelölt 12: Kék foltok</string>
+    <string name="wa_field_unmarked_12_blue">WA terep jelöletlen 12: Kék foltok</string>
+    <string name="wa_field_unmarked_24_blue">WA terep jelöletlen 12: Kék foltok</string>
+    <string name="wa_field_unmarked_marked_yellow">WA terep 12 jelöletlen/12 megjelölve: Sárga foltok</string>
+    <string name="wa_field_marked_12_yellow">WA terep jelölt 12: Sárga foltok</string>
+    <string name="wa_field_marked_24_yellow">WA terep jelölt 24: Sárga foltok</string>
+    <string name="wa_field_unmarked_12_yellow">WA terep jelöletlen 12: Sárga foltok</string>
+    <string name="wa_field_unmarked_24_yellow">WA terep jelöletlen 24: Sárga foltok</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-hu/strings.xml b/shared/src/main/res/values-hu/strings.xml
index fccd3fbe0..f64c392f3 100644
--- a/shared/src/main/res/values-hu/strings.xml
+++ b/shared/src/main/res/values-hu/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Olimpiai/Reflex íj</string>
-  <string name="compound_bow">Csigás íj</string>
-  <string name="bare_bow">Iránzék nélküli reflex íj - BB</string>
-  <string name="long_bow">Hosszúíj - Longbow</string>
-  <string name="horse_bow">Lovas/hagyományos íj</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Napos</string>
-  <string name="partly_cloudy">Helyenként felhős</string>
-  <string name="cloudy">Felhős</string>
-  <string name="light_rain">Enyhe szitáló eső</string>
-  <string name="rain">Esős</string>
-  <string name="round_desc">%1$s: %2$d × %3$d vessző (%4$s lőlap)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Kicsi</string>
-  <string name="medium">Közepes</string>
-  <string name="large">Nagy</string>
-  <string name="xlarge">Extra nagy</string>
-  <string name="unknown">Ismeretlen</string>
-  <string name="indoor">Terem</string>
-  <string name="wind">Szél</string>
-  <string name="location">Helyszín</string>
-  <string name="bft_0">0 Bft: szélcsend</string>
-  <string name="bft_1">1 Bft: a falevelek mozdulatlanok</string>
-  <string name="bft_2">2 Bft: a falevelek megmozdulnak</string>
-  <string name="bft_3">3 Bft: könnyű zászlók megmozdulnak</string>
-  <string name="bft_4">4 Bft: a vékony ágak megmozdulnak</string>
-  <string name="bft_5">5 Bft: a kis fák megmozdulnak</string>
-  <string name="bft_6">6 Bft: a nagy ágak is mozdulnak</string>
-  <string name="bft_7">7 Bft: a fák teljes lombozata mozdul</string>
-  <string name="bft_8">8 Bft: a kis ágak töredeznek</string>
-  <string name="bft_9">9 Bft: VIHAR</string>
-  <string name="front">szemből</string>
-  <string name="back">hátulról</string>
-  <string name="left">balról</string>
-  <string name="right">jobb</string>
-  <string name="left_front">szemből bal oldalról</string>
-  <string name="right_front">szemből jobb oldalról</string>
-  <string name="left_back">hátulról balról</string>
-  <string name="right_back">hátulról  jobbról</string>
-  <string name="stop">ÁLLJ!</string>
-  <string name="end_n">%d sorozat</string>
-  <string name="miss">Mellé</string>
-  <string name="backspace">Visszatörlés</string>
-  <string name="accessibility_description_shot_n_score">%1$d lövés a %2$s-ból</string>
-  <plurals name="rounds">
-    <item quantity="one">%d. forduló</item>
-    <item quantity="other">%d. forduló</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d vessző</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d. vessző/sorozat</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Olimpiai/Reflex íj</string>
+    <string name="compound_bow">Csigás íj</string>
+    <string name="bare_bow">Iránzék nélküli reflex íj - BB</string>
+    <string name="long_bow">Hosszúíj - Longbow</string>
+    <string name="horse_bow">Lovas/hagyományos íj</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Napos</string>
+    <string name="partly_cloudy">Helyenként felhős</string>
+    <string name="cloudy">Felhős</string>
+    <string name="light_rain">Enyhe szitáló eső</string>
+    <string name="rain">Esős</string>
+    <string name="round_desc">%1$s: %2$d × %3$d vessző (%4$s lőlap)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Kicsi</string>
+    <string name="medium">Közepes</string>
+    <string name="large">Nagy</string>
+    <string name="xlarge">Extra nagy</string>
+    <string name="unknown">Ismeretlen</string>
+    <string name="indoor">Terem</string>
+    <string name="wind">Szél</string>
+    <string name="location">Helyszín</string>
+    <string name="bft_0">0 Bft: szélcsend</string>
+    <string name="bft_1">1 Bft: a falevelek mozdulatlanok</string>
+    <string name="bft_2">2 Bft: a falevelek megmozdulnak</string>
+    <string name="bft_3">3 Bft: könnyű zászlók megmozdulnak</string>
+    <string name="bft_4">4 Bft: a vékony ágak megmozdulnak</string>
+    <string name="bft_5">5 Bft: a kis fák megmozdulnak</string>
+    <string name="bft_6">6 Bft: a nagy ágak is mozdulnak</string>
+    <string name="bft_7">7 Bft: a fák teljes lombozata mozdul</string>
+    <string name="bft_8">8 Bft: a kis ágak töredeznek</string>
+    <string name="bft_9">9 Bft: VIHAR</string>
+    <string name="front">szemből</string>
+    <string name="back">hátulról</string>
+    <string name="left">balról</string>
+    <string name="right">jobb</string>
+    <string name="left_front">szemből bal oldalról</string>
+    <string name="right_front">szemből jobb oldalról</string>
+    <string name="left_back">hátulról balról</string>
+    <string name="right_back">hátulról  jobbról</string>
+    <string name="stop">ÁLLJ!</string>
+    <string name="end_n">%d sorozat</string>
+    <string name="miss">Mellé</string>
+    <string name="backspace">Visszatörlés</string>
+    <string name="accessibility_description_shot_n_score">%1$d lövés a %2$s-ból</string>
+    <plurals name="rounds">
+        <item quantity="one">%d. forduló</item>
+        <item quantity="other">%d. forduló</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d vessző</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d. vessző/sorozat</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-hu/target_faces.xml b/shared/src/main/res/values-hu/target_faces.xml
index 87eda939a..55134e8de 100644
--- a/shared/src/main/res/values-hu/target_faces.xml
+++ b/shared/src/main/res/values-hu/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Szabványos</string>
-  <string name="target_type_field_archery">Terep</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA teljes</string>
-  <string name="wa_6_ring">WA 6-os szűkétéssel</string>
-  <string name="wa_5_ring">WA 5-ös szűkítéssel</string>
-  <string name="wa_3_ring">WA 3-as szűkítéssel</string>
-  <string name="vegas_3_spot">Vegas 3as lőlap</string>
-  <string name="vertical_3_spot">WA függőleges 3as lőlap</string>
-  <string name="wa_3_ring_3_spot">WA 3-as szűkítés 3as lőlap</string>
-  <string name="nfaa_field">NFAA terep</string>
-  <string name="nfaa_expert_field">NFAA haladó terep</string>
-  <string name="nfaa_hunter">NFAA vadász</string>
-  <string name="nfaa_indoor">NFAA terem</string>
-  <string name="nfaa_indoor_5_spot">NFAA beltéri 5 pontos</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA terep</string>
-  <string name="hit_or_miss">Talált/nem-tatlált</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D DAIR</string>
-  <string name="ifaa_animal">IFAA állat</string>
-  <string name="nfaa_animal">NFAA állat</string>
-  <string name="nfas_field">NFAS terep</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA időszak</string>
-  <string name="wa_field_3_spot">WA Field 3-as lőlap</string>
-  <string name="wa_danage_3_spot">WA Danage 3 pontos</string>
-  <string name="wa_danage_6_spot">WA Danage 6 pontos</string>
-  <string name="dbsc_blowpipe">DBSC fúvócső</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">Színes FCFS (fordított 10 – 1)</string>
-  <string name="recurve_style_x_1">Olimpiai stílus (X-1)</string>
-  <string name="recurve_style_10_1">Olimpiai stílus (10-1)</string>
-  <string name="recurve_style_x_5">Olimpiai stílus (X-5)</string>
-  <string name="recurve_style_10_5">Olimpiai stílus (10-5)</string>
-  <string name="recurve_style_x_6">Olimpiai stílus (X-6)</string>
-  <string name="recurve_style_10_6">Olimpiai stílus (10-6)</string>
-  <string name="recurve_style_x_8">Olimpiai stílus (X-8)</string>
-  <string name="recurve_style_10_8">Olimpiai stílus (10-8)</string>
-  <string name="compound_style">Csigás-íj tipusú</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Szabványos</string>
+    <string name="target_type_field_archery">Terep</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA teljes</string>
+    <string name="wa_6_ring">WA 6-os szűkétéssel</string>
+    <string name="wa_5_ring">WA 5-ös szűkítéssel</string>
+    <string name="wa_3_ring">WA 3-as szűkítéssel</string>
+    <string name="vegas_3_spot">Vegas 3as lőlap</string>
+    <string name="vertical_3_spot">WA függőleges 3as lőlap</string>
+    <string name="wa_3_ring_3_spot">WA 3-as szűkítés 3as lőlap</string>
+    <string name="nfaa_field">NFAA terep</string>
+    <string name="nfaa_expert_field">NFAA haladó terep</string>
+    <string name="nfaa_hunter">NFAA vadász</string>
+    <string name="nfaa_indoor">NFAA terem</string>
+    <string name="nfaa_indoor_5_spot">NFAA beltéri 5 pontos</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA terep</string>
+    <string name="hit_or_miss">Talált/nem-tatlált</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D DAIR</string>
+    <string name="ifaa_animal">IFAA állat</string>
+    <string name="nfaa_animal">NFAA állat</string>
+    <string name="nfas_field">NFAS terep</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA időszak</string>
+    <string name="wa_field_3_spot">WA Field 3-as lőlap</string>
+    <string name="wa_danage_3_spot">WA Danage 3 pontos</string>
+    <string name="wa_danage_6_spot">WA Danage 6 pontos</string>
+    <string name="dbsc_blowpipe">DBSC fúvócső</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">Színes FCFS (fordított 10 – 1)</string>
+    <string name="recurve_style_x_1">Olimpiai stílus (X-1)</string>
+    <string name="recurve_style_10_1">Olimpiai stílus (10-1)</string>
+    <string name="recurve_style_x_5">Olimpiai stílus (X-5)</string>
+    <string name="recurve_style_10_5">Olimpiai stílus (10-5)</string>
+    <string name="recurve_style_x_6">Olimpiai stílus (X-6)</string>
+    <string name="recurve_style_10_6">Olimpiai stílus (10-6)</string>
+    <string name="recurve_style_x_8">Olimpiai stílus (X-8)</string>
+    <string name="recurve_style_10_8">Olimpiai stílus (10-8)</string>
+    <string name="compound_style">Csigás-íj tipusú</string>
 </resources>
diff --git a/shared/src/main/res/values-in/rounds.xml b/shared/src/main/res/values-in/rounds.xml
index f8d2aab94..f9cae7f02 100644
--- a/shared/src/main/res/values-in/rounds.xml
+++ b/shared/src/main/res/values-in/rounds.xml
@@ -15,209 +15,209 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australia mengadakan didalam</string>
-  <string name="australian_indoor_1">1 dalam Australia</string>
-  <string name="australian_indoor_2">Australia dalam ruangan 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40 cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Titik</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Gabungan</string>
-  <string name="match_round">Pertandingan Putaran</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Mengkritik I</string>
-  <string name="bray_ii">Mengkritik II</string>
-  <string name="portsmouth">Pelabuhan mulut</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Dewasa / Remaja</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 didalam: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA / IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman dalam ruangan</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Penghapusan Senyawa Individu 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Penghapusan Senyawa Individu 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Penghapusan Senyawa Individu 50m</string>
-  <string name="wa_recurve_elimination_18">WA membalikan penghapusan 18m</string>
-  <string name="wa_recurve_elimination_50">WA membalikan penghapusan 50m</string>
-  <string name="wa_recurve_elimination_60">WA membalikan eliminasi 60m</string>
-  <string name="wa_recurve_elimination_70">WA membalikan eliminasi 60m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Kadet Pria</string>
-  <string name="wa_1440_cadet_women">WA 1440 Kadet Wanita</string>
-  <string name="wa_compound_individual">WA senyawa individu</string>
-  <string name="wa_compound_qualification">WA senyawa kualifikasi</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standar</string>
-  <string name="olympic_round">Putaran Olimpiade</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior pria</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior wanita</string>
-  <string name="wa_1440_men_master_50">WA 1440 pria Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 pria Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 pria Master
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australia mengadakan didalam</string>
+    <string name="australian_indoor_1">1 dalam Australia</string>
+    <string name="australian_indoor_2">Australia dalam ruangan 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40 cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Titik</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Gabungan</string>
+    <string name="match_round">Pertandingan Putaran</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Mengkritik I</string>
+    <string name="bray_ii">Mengkritik II</string>
+    <string name="portsmouth">Pelabuhan mulut</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Dewasa / Remaja</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 didalam: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA / IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman dalam ruangan</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Penghapusan Senyawa Individu 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Penghapusan Senyawa Individu 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Penghapusan Senyawa Individu 50m</string>
+    <string name="wa_recurve_elimination_18">WA membalikan penghapusan 18m</string>
+    <string name="wa_recurve_elimination_50">WA membalikan penghapusan 50m</string>
+    <string name="wa_recurve_elimination_60">WA membalikan eliminasi 60m</string>
+    <string name="wa_recurve_elimination_70">WA membalikan eliminasi 60m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Kadet Pria</string>
+    <string name="wa_1440_cadet_women">WA 1440 Kadet Wanita</string>
+    <string name="wa_compound_individual">WA senyawa individu</string>
+    <string name="wa_compound_qualification">WA senyawa kualifikasi</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standar</string>
+    <string name="olympic_round">Putaran Olimpiade</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior pria</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior wanita</string>
+    <string name="wa_1440_men_master_50">WA 1440 pria Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 pria Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 pria Master
 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Pria Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 perempuan menguasai 50 +</string>
-  <string name="wa_1440_women_master_60">WA 1440 perempuan menguasai 60 +</string>
-  <string name="wa_1440_women_master_70">WA 1440 perempuan menguasai 70 +</string>
-  <string name="wa_1440_women_senior">WA 1440 Wanita Senior</string>
-  <string name="half_wa_1440_cadet_men">Setengah WA 1440 Kadet Pria</string>
-  <string name="half_wa_1440_cadet_women">Setengah WA 1440 Kadet Wanita</string>
-  <string name="half_wa_1440_junior_men">Setengah WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Setengah WA 1440 Junior Wanita</string>
-  <string name="half_wa_1440_men_master_50">WA 1440 pria Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 laki Master 60+</string>
-  <string name="half_wa_1440_men_master_70">WA 1440 pria Master 70+</string>
-  <string name="half_wa_1440_men_senior">Setengah WA 1440 Pria Senior</string>
-  <string name="half_wa_1440_women_master_50">Setengah WA 1440 Wanita Guru 50+</string>
-  <string name="half_wa_1440_women_master_60">Menguasai setengah WA 1440 perempuan 60 +</string>
-  <string name="half_wa_1440_women_master_70">Setengah WA 1440 Wanita Guru 70+</string>
-  <string name="half_wa_1440_women_senior">Setengah WA 1440 Wanita Senior</string>
-  <string name="wa_double_720_30_80cm">WA ganda 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA ganda 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA ganda 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA ganda 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA ganda 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA ganda 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA ganda 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Amerika</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Sini mengarungi</string>
-  <string name="short_junior_national">Smp Nasional</string>
-  <string name="short_junior_warwick">Pendek Junior Warwick</string>
-  <string name="short_junior_western">Pendek Junior Barat</string>
-  <string name="short_junior_windsor">Pendek Junior Windsor</string>
-  <string name="junior_national">Junior Nasional</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Barat</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Pendek Nasional</string>
-  <string name="short_warwick">Pendek Warwick</string>
-  <string name="short_western">Pendek barat</string>
-  <string name="short_windsor">Windsor pendek</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Barat</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Panjang Nasional</string>
-  <string name="long_warwick">Warwick panjang</string>
-  <string name="long_western">Panjang Barat</string>
-  <string name="new_national">Nasional baru</string>
-  <string name="new_warwick">Perang sumbu baru</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Radang dingin</string>
-  <string name="half_metric_i">Setengah Metrik I</string>
-  <string name="half_metric_ii">Setengah Metrik II</string>
-  <string name="half_metric_iii">Setengah Metrik III</string>
-  <string name="half_metric_iv">Setengah Metrik IV</string>
-  <string name="half_metric_v">Setengah metrik v</string>
-  <string name="short_metric_i">Metrik Pendek saya</string>
-  <string name="short_metric_ii">Metrik Pendek II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Metrik Singkat IV</string>
-  <string name="short_metric_v">Metrik Pendek V</string>
-  <string name="metric_i">Metrik I</string>
-  <string name="metric_ii">Metrik II</string>
-  <string name="metric_iii">Metrik III</string>
-  <string name="metric_iv">Metrik IV</string>
-  <string name="metric_v">Metrik V</string>
-  <string name="long_metric_i">Metrik Panjang saya</string>
-  <string name="long_metric_ii">Panjang Metrik II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Metrik Panjang IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Metrik Panjang (Tuan-tuan)</string>
-  <string name="long_metric_ladies">Metrik Panjang (Wanita)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Itik jantan</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Suaka</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Menengah</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Panjang Brisbane</string>
-  <string name="long_sydney">Panjang Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Adelaide yang pendek</string>
-  <string name="short_canberra">Canberra singkat</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic / Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic / Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic / Dakota: Junior / Pemuda</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: SMP / Remaja</string>
-  <string name="nfaa_810">NFAA / American 810</string>
-  <string name="nfaa_810_cub">NFAA / American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA / American 810: Junior / Youth</string>
-  <string name="nfaa_900">NFAA / American 900</string>
-  <string name="nfaa_900_cub">NFAA / American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA / American 900: Junior / Youth</string>
-  <string name="canadian_900">Kanada 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">Hewan IFAA 280</string>
-  <string name="ifaa_animal_300">Hewan IFAA 300</string>
-  <string name="ifaa_animal_560">Hewan IFAA 560</string>
-  <string name="nfaa_international_150">NFAA / IFAA Internasional 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">Hewan IFAA 280</string>
-  <string name="nfaa_animal_300">Hewan IFAA 300</string>
-  <string name="nfaa_animal_588">NFAA hewan 588</string>
-  <string name="nfaa_lake_of_woods">Danau NFAA dariWoods</string>
-  <string name="nfaa_expert_field_300">Bidang Ahli NFAA / IFAA 300</string>
-  <string name="nfaa_expert_field_only_560">Bidang Pakar NFAA / IFAA Hanya 560</string>
-  <string name="nfaa_field_280">Lapangan NFAA / IFAA 280</string>
-  <string name="nfaa_field_300">Lapangan NFAA / IFAA 300</string>
-  <string name="nfaa_field_560">Lapangan NFAA / IFAA 560</string>
-  <string name="nfaa_hunter_280">NFAA / IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA / IFAA pemburu 300</string>
-  <string name="nfaa_hunter_560">Naka / IFAA pemburu 560</string>
-  <string name="nfaa_field_hunter_560">Lapangan NFAA / IFAA /pemburu560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked / 12 Ditandai: Pegas Merah</string>
-  <string name="wa_field_marked_12_red">Lapangan WA Ditandai 12: Pegangan Merah</string>
-  <string name="wa_field_marked_24_red">Lapangan WA Ditandai 24: Pegas Merah</string>
-  <string name="wa_field_unmarked_12_red">Lapangan WA Unmarked 12: Pegas Merah</string>
-  <string name="wa_field_unmarked_24_red">Lapangan WA Tanpa Tanda 24: Pegas Merah</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked / 12 Ditandai: Pegas Biru</string>
-  <string name="wa_field_marked_12_blue">Lapangan WA Ditandai 12: Pegas Biru</string>
-  <string name="wa_field_marked_24_blue">Lapangan WA Ditandai 24: Pegas Biru</string>
-  <string name="wa_field_unmarked_12_blue">Lapangan WA Tanpa Tanda 12: Pegas Biru</string>
-  <string name="wa_field_unmarked_24_blue">Lapangan WA Tanpa Tanda 24: Pegas Biru</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked / 12 Ditandai: Pegas Kuning</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Pegas Kuning</string>
-  <string name="wa_field_marked_24_yellow">Lapangan WA Ditandai 24: Pegas Kuning</string>
-  <string name="wa_field_unmarked_12_yellow">Lapangan WA Tanpa Tanda 12: Pegas Kuning</string>
-  <string name="wa_field_unmarked_24_yellow">Lapangan WA Tanpa Tanda 24: Pegas Kuning</string>
-  <string name="big_game_36">Game Besar 36</string>
-  <string name="big_game_40">Game Besar 40</string>
+    <string name="wa_1440_men_senior">WA 1440 Pria Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 perempuan menguasai 50 +</string>
+    <string name="wa_1440_women_master_60">WA 1440 perempuan menguasai 60 +</string>
+    <string name="wa_1440_women_master_70">WA 1440 perempuan menguasai 70 +</string>
+    <string name="wa_1440_women_senior">WA 1440 Wanita Senior</string>
+    <string name="half_wa_1440_cadet_men">Setengah WA 1440 Kadet Pria</string>
+    <string name="half_wa_1440_cadet_women">Setengah WA 1440 Kadet Wanita</string>
+    <string name="half_wa_1440_junior_men">Setengah WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Setengah WA 1440 Junior Wanita</string>
+    <string name="half_wa_1440_men_master_50">WA 1440 pria Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 laki Master 60+</string>
+    <string name="half_wa_1440_men_master_70">WA 1440 pria Master 70+</string>
+    <string name="half_wa_1440_men_senior">Setengah WA 1440 Pria Senior</string>
+    <string name="half_wa_1440_women_master_50">Setengah WA 1440 Wanita Guru 50+</string>
+    <string name="half_wa_1440_women_master_60">Menguasai setengah WA 1440 perempuan 60 +</string>
+    <string name="half_wa_1440_women_master_70">Setengah WA 1440 Wanita Guru 70+</string>
+    <string name="half_wa_1440_women_senior">Setengah WA 1440 Wanita Senior</string>
+    <string name="wa_double_720_30_80cm">WA ganda 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA ganda 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA ganda 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA ganda 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA ganda 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA ganda 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA ganda 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Amerika</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Sini mengarungi</string>
+    <string name="short_junior_national">Smp Nasional</string>
+    <string name="short_junior_warwick">Pendek Junior Warwick</string>
+    <string name="short_junior_western">Pendek Junior Barat</string>
+    <string name="short_junior_windsor">Pendek Junior Windsor</string>
+    <string name="junior_national">Junior Nasional</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Barat</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Pendek Nasional</string>
+    <string name="short_warwick">Pendek Warwick</string>
+    <string name="short_western">Pendek barat</string>
+    <string name="short_windsor">Windsor pendek</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Barat</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Panjang Nasional</string>
+    <string name="long_warwick">Warwick panjang</string>
+    <string name="long_western">Panjang Barat</string>
+    <string name="new_national">Nasional baru</string>
+    <string name="new_warwick">Perang sumbu baru</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Radang dingin</string>
+    <string name="half_metric_i">Setengah Metrik I</string>
+    <string name="half_metric_ii">Setengah Metrik II</string>
+    <string name="half_metric_iii">Setengah Metrik III</string>
+    <string name="half_metric_iv">Setengah Metrik IV</string>
+    <string name="half_metric_v">Setengah metrik v</string>
+    <string name="short_metric_i">Metrik Pendek saya</string>
+    <string name="short_metric_ii">Metrik Pendek II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Metrik Singkat IV</string>
+    <string name="short_metric_v">Metrik Pendek V</string>
+    <string name="metric_i">Metrik I</string>
+    <string name="metric_ii">Metrik II</string>
+    <string name="metric_iii">Metrik III</string>
+    <string name="metric_iv">Metrik IV</string>
+    <string name="metric_v">Metrik V</string>
+    <string name="long_metric_i">Metrik Panjang saya</string>
+    <string name="long_metric_ii">Panjang Metrik II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Metrik Panjang IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Metrik Panjang (Tuan-tuan)</string>
+    <string name="long_metric_ladies">Metrik Panjang (Wanita)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Itik jantan</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Suaka</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Menengah</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Panjang Brisbane</string>
+    <string name="long_sydney">Panjang Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Adelaide yang pendek</string>
+    <string name="short_canberra">Canberra singkat</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic / Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic / Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic / Dakota: Junior / Pemuda</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: SMP / Remaja</string>
+    <string name="nfaa_810">NFAA / American 810</string>
+    <string name="nfaa_810_cub">NFAA / American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA / American 810: Junior / Youth</string>
+    <string name="nfaa_900">NFAA / American 900</string>
+    <string name="nfaa_900_cub">NFAA / American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA / American 900: Junior / Youth</string>
+    <string name="canadian_900">Kanada 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">Hewan IFAA 280</string>
+    <string name="ifaa_animal_300">Hewan IFAA 300</string>
+    <string name="ifaa_animal_560">Hewan IFAA 560</string>
+    <string name="nfaa_international_150">NFAA / IFAA Internasional 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">Hewan IFAA 280</string>
+    <string name="nfaa_animal_300">Hewan IFAA 300</string>
+    <string name="nfaa_animal_588">NFAA hewan 588</string>
+    <string name="nfaa_lake_of_woods">Danau NFAA dariWoods</string>
+    <string name="nfaa_expert_field_300">Bidang Ahli NFAA / IFAA 300</string>
+    <string name="nfaa_expert_field_only_560">Bidang Pakar NFAA / IFAA Hanya 560</string>
+    <string name="nfaa_field_280">Lapangan NFAA / IFAA 280</string>
+    <string name="nfaa_field_300">Lapangan NFAA / IFAA 300</string>
+    <string name="nfaa_field_560">Lapangan NFAA / IFAA 560</string>
+    <string name="nfaa_hunter_280">NFAA / IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA / IFAA pemburu 300</string>
+    <string name="nfaa_hunter_560">Naka / IFAA pemburu 560</string>
+    <string name="nfaa_field_hunter_560">Lapangan NFAA / IFAA /pemburu560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked / 12 Ditandai: Pegas Merah</string>
+    <string name="wa_field_marked_12_red">Lapangan WA Ditandai 12: Pegangan Merah</string>
+    <string name="wa_field_marked_24_red">Lapangan WA Ditandai 24: Pegas Merah</string>
+    <string name="wa_field_unmarked_12_red">Lapangan WA Unmarked 12: Pegas Merah</string>
+    <string name="wa_field_unmarked_24_red">Lapangan WA Tanpa Tanda 24: Pegas Merah</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked / 12 Ditandai: Pegas Biru</string>
+    <string name="wa_field_marked_12_blue">Lapangan WA Ditandai 12: Pegas Biru</string>
+    <string name="wa_field_marked_24_blue">Lapangan WA Ditandai 24: Pegas Biru</string>
+    <string name="wa_field_unmarked_12_blue">Lapangan WA Tanpa Tanda 12: Pegas Biru</string>
+    <string name="wa_field_unmarked_24_blue">Lapangan WA Tanpa Tanda 24: Pegas Biru</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked / 12 Ditandai: Pegas Kuning</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Pegas Kuning</string>
+    <string name="wa_field_marked_24_yellow">Lapangan WA Ditandai 24: Pegas Kuning</string>
+    <string name="wa_field_unmarked_12_yellow">Lapangan WA Tanpa Tanda 12: Pegas Kuning</string>
+    <string name="wa_field_unmarked_24_yellow">Lapangan WA Tanpa Tanda 24: Pegas Kuning</string>
+    <string name="big_game_36">Game Besar 36</string>
+    <string name="big_game_40">Game Besar 40</string>
 </resources>
diff --git a/shared/src/main/res/values-in/strings.xml b/shared/src/main/res/values-in/strings.xml
index c363bb67a..ae1b816fa 100644
--- a/shared/src/main/res/values-in/strings.xml
+++ b/shared/src/main/res/values-in/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Cerah</string>
-  <string name="partly_cloudy">Cerah berawan</string>
-  <string name="cloudy">Berawan</string>
-  <string name="light_rain">Hujan ringan</string>
-  <string name="rain">Hujan</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d panah (%4$s wajah)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Kecil</string>
-  <string name="medium">Sedang</string>
-  <string name="large">Besar</string>
-  <string name="xlarge">XBesar</string>
-  <string name="unknown">Tidak diketahui</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Angin</string>
-  <string name="location">Lokasi</string>
-  <string name="bft_0">0 Bft: Tidak berangin</string>
-  <string name="bft_1">1 Bft: Daun tidak bergerak</string>
-  <string name="bft_2">2 Bft: Daun mulai bergerak</string>
-  <string name="bft_3">3 Bft: Bendera kecil mulai bergerak</string>
-  <string name="bft_4">4 Bft: Ranting mulai bergerak</string>
-  <string name="bft_5">5 Bft: Pohon kecil bergerak</string>
-  <string name="bft_6">6 Bft: Dahan bergerak</string>
-  <string name="bft_7">7 Bft: Seluruh pohon bergerak</string>
-  <string name="bft_8">8 Bft: Dahan kecil patah</string>
-  <string name="bft_9">9 Bft: Badai</string>
-  <string name="front">dari depan</string>
-  <string name="back">dari belakang</string>
-  <string name="left">dari kiri</string>
-  <string name="right">dari kanan</string>
-  <string name="left_front">dari depan kiri</string>
-  <string name="right_front">dari depan kanan</string>
-  <string name="left_back">dari belakang kiri</string>
-  <string name="right_back">dari belakang kanan</string>
-  <string name="stop">BERHENTI</string>
-  <string name="end_n">Akhir %d</string>
-  <string name="miss">Kehilangan</string>
-  <string name="backspace">Menghapus</string>
-  <string name="accessibility_description_shot_n_score">Tembakan %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d putaran</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">% 1 $ d \ u00D7 % 2 $ d panah</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d panah per akhir</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Cerah</string>
+    <string name="partly_cloudy">Cerah berawan</string>
+    <string name="cloudy">Berawan</string>
+    <string name="light_rain">Hujan ringan</string>
+    <string name="rain">Hujan</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d panah (%4$s wajah)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Kecil</string>
+    <string name="medium">Sedang</string>
+    <string name="large">Besar</string>
+    <string name="xlarge">XBesar</string>
+    <string name="unknown">Tidak diketahui</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Angin</string>
+    <string name="location">Lokasi</string>
+    <string name="bft_0">0 Bft: Tidak berangin</string>
+    <string name="bft_1">1 Bft: Daun tidak bergerak</string>
+    <string name="bft_2">2 Bft: Daun mulai bergerak</string>
+    <string name="bft_3">3 Bft: Bendera kecil mulai bergerak</string>
+    <string name="bft_4">4 Bft: Ranting mulai bergerak</string>
+    <string name="bft_5">5 Bft: Pohon kecil bergerak</string>
+    <string name="bft_6">6 Bft: Dahan bergerak</string>
+    <string name="bft_7">7 Bft: Seluruh pohon bergerak</string>
+    <string name="bft_8">8 Bft: Dahan kecil patah</string>
+    <string name="bft_9">9 Bft: Badai</string>
+    <string name="front">dari depan</string>
+    <string name="back">dari belakang</string>
+    <string name="left">dari kiri</string>
+    <string name="right">dari kanan</string>
+    <string name="left_front">dari depan kiri</string>
+    <string name="right_front">dari depan kanan</string>
+    <string name="left_back">dari belakang kiri</string>
+    <string name="right_back">dari belakang kanan</string>
+    <string name="stop">BERHENTI</string>
+    <string name="end_n">Akhir %d</string>
+    <string name="miss">Kehilangan</string>
+    <string name="backspace">Menghapus</string>
+    <string name="accessibility_description_shot_n_score">Tembakan %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d putaran</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">% 1 $ d \ u00D7 % 2 $ d panah</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d panah per akhir</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-in/target_faces.xml b/shared/src/main/res/values-in/target_faces.xml
index 51d85aac8..112f93681 100644
--- a/shared/src/main/res/values-in/target_faces.xml
+++ b/shared/src/main/res/values-in/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Reguler</string>
-  <string name="target_type_field_archery">Bidang</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Penuh</string>
-  <string name="wa_6_ring">WA 6 cincin</string>
-  <string name="wa_5_ring">WA 5 Cincin</string>
-  <string name="wa_3_ring">WA 3 Cincin</string>
-  <string name="vegas_3_spot">Vegas 3 tempat</string>
-  <string name="vertical_3_spot">WA Vertikal 3 Titik</string>
-  <string name="wa_3_ring_3_spot">WA 3 cincin 3 tempat</string>
-  <string name="nfaa_field">Lapangan NFAA</string>
-  <string name="nfaa_expert_field">Bidang Pakar NFAA</string>
-  <string name="nfaa_hunter">NFAA berburu</string>
-  <string name="nfaa_indoor">NFAA didalam</string>
-  <string name="nfaa_indoor_5_spot">Nfaa dalam 5 tempat</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">Lapangan WA</string>
-  <string name="hit_or_miss">Kena atau tidak</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">Hewan IFAA</string>
-  <string name="nfaa_animal">Hewan NFAA</string>
-  <string name="nfas_field">Bidang NFAS</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">Periode SCA</string>
-  <string name="wa_field_3_spot">WA bidang 3 tempat</string>
-  <string name="wa_danage_3_spot">WA danage 3 tempat</string>
-  <string name="wa_danage_6_spot">WA Danage 6 tempat</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">Warna FCFS (Terbalik 10-1)</string>
-  <string name="recurve_style_x_1">Gaya recurve (X-1)</string>
-  <string name="recurve_style_10_1">Gaya recurve (10-1)</string>
-  <string name="recurve_style_x_5">Gaya recurve (X-5)</string>
-  <string name="recurve_style_10_5">Gaya recurve (10-5)</string>
-  <string name="recurve_style_x_6">Gaya recurve (X-6)</string>
-  <string name="recurve_style_10_6">Gaya recurve (10-6)</string>
-  <string name="recurve_style_x_8">Gaya recurve (X-8)</string>
-  <string name="recurve_style_10_8">Gaya recurve (10-8)</string>
-  <string name="compound_style">Gaya majemuk</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Reguler</string>
+    <string name="target_type_field_archery">Bidang</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Penuh</string>
+    <string name="wa_6_ring">WA 6 cincin</string>
+    <string name="wa_5_ring">WA 5 Cincin</string>
+    <string name="wa_3_ring">WA 3 Cincin</string>
+    <string name="vegas_3_spot">Vegas 3 tempat</string>
+    <string name="vertical_3_spot">WA Vertikal 3 Titik</string>
+    <string name="wa_3_ring_3_spot">WA 3 cincin 3 tempat</string>
+    <string name="nfaa_field">Lapangan NFAA</string>
+    <string name="nfaa_expert_field">Bidang Pakar NFAA</string>
+    <string name="nfaa_hunter">NFAA berburu</string>
+    <string name="nfaa_indoor">NFAA didalam</string>
+    <string name="nfaa_indoor_5_spot">Nfaa dalam 5 tempat</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">Lapangan WA</string>
+    <string name="hit_or_miss">Kena atau tidak</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">Hewan IFAA</string>
+    <string name="nfaa_animal">Hewan NFAA</string>
+    <string name="nfas_field">Bidang NFAS</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">Periode SCA</string>
+    <string name="wa_field_3_spot">WA bidang 3 tempat</string>
+    <string name="wa_danage_3_spot">WA danage 3 tempat</string>
+    <string name="wa_danage_6_spot">WA Danage 6 tempat</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">Warna FCFS (Terbalik 10-1)</string>
+    <string name="recurve_style_x_1">Gaya recurve (X-1)</string>
+    <string name="recurve_style_10_1">Gaya recurve (10-1)</string>
+    <string name="recurve_style_x_5">Gaya recurve (X-5)</string>
+    <string name="recurve_style_10_5">Gaya recurve (10-5)</string>
+    <string name="recurve_style_x_6">Gaya recurve (X-6)</string>
+    <string name="recurve_style_10_6">Gaya recurve (10-6)</string>
+    <string name="recurve_style_x_8">Gaya recurve (X-8)</string>
+    <string name="recurve_style_10_8">Gaya recurve (10-8)</string>
+    <string name="compound_style">Gaya majemuk</string>
 </resources>
diff --git a/shared/src/main/res/values-it/rounds.xml b/shared/src/main/res/values-it/rounds.xml
index 6008433f8..ee99a2683 100644
--- a/shared/src/main/res/values-it/rounds.xml
+++ b/shared/src/main/res/values-it/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Round Olimpico</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-it/strings.xml b/shared/src/main/res/values-it/strings.xml
index 9e60eac0d..70042397b 100644
--- a/shared/src/main/res/values-it/strings.xml
+++ b/shared/src/main/res/values-it/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arco ricurvo</string>
-  <string name="compound_bow">Arco compound</string>
-  <string name="bare_bow">Arco nudo</string>
-  <string name="long_bow">Arco lungo</string>
-  <string name="horse_bow">Arco da cavallo</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sereno</string>
-  <string name="partly_cloudy">Parzialmente nuvoloso</string>
-  <string name="cloudy">Nuvoloso</string>
-  <string name="light_rain">Pioggia leggera</string>
-  <string name="rain">Piovoso</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (targa da %4$s)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Piccolo</string>
-  <string name="medium">Medio</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Sconosciuto</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Vento</string>
-  <string name="location">Posizione</string>
-  <string name="bft_0">0 Bft: senza vento</string>
-  <string name="bft_1">1 Bft: Le foglie non si muovono</string>
-  <string name="bft_2">2 Bft: le foglie cominciano a muoversi</string>
-  <string name="bft_3">3 Bft: bandiere leggere comincano a muoversi</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">da davanti</string>
-  <string name="back">da dietro</string>
-  <string name="left">da sinistra</string>
-  <string name="right">da destra</string>
-  <string name="left_front">da davanti a sinistra</string>
-  <string name="right_front">da davanti a destra</string>
-  <string name="left_back">da dietro a sinistra</string>
-  <string name="right_back">da dietro a destra</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Volée %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d frecce per volée</item>
-    <item quantity="other">%d frecce per volée</item>
-  </plurals>
+    <string name="recurve_bow">Arco ricurvo olimpico</string>
+    <string name="compound_bow">Arco compound</string>
+    <string name="bare_bow">Arco nudo</string>
+    <string name="long_bow">Arco lungo</string>
+    <string name="horse_bow">Arco da cavallo</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Soleggiato</string>
+    <string name="partly_cloudy">Parzialmente nuvoloso</string>
+    <string name="cloudy">Nuvoloso</string>
+    <string name="light_rain">Pioggia leggera</string>
+    <string name="rain">Piovoso</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (targa da %4$s)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Piccolo</string>
+    <string name="medium">Medio</string>
+    <string name="large">Grande</string>
+    <string name="xlarge">Molto Grande</string>
+    <string name="unknown">Sconosciuto</string>
+    <string name="indoor">Al chiuso</string>
+    <string name="wind">Vento</string>
+    <string name="location">Posizione</string>
+    <string name="bft_0">0 Bft: Senza vento</string>
+    <string name="bft_1">1 Bft: Le foglie non si muovono</string>
+    <string name="bft_2">2 Bft: Le foglie iniziano a muoversi</string>
+    <string name="bft_3">3 Bft: Bandiere leggere iniziano ad agitarsi</string>
+    <string name="bft_4">4 Bft: Piccoli rami iniziano a ondeggiare</string>
+    <string name="bft_5">5 Bft: Oscillazione di piccoli alberi</string>
+    <string name="bft_6">6 Bft: Movimento di grossi rami</string>
+    <string name="bft_7">7 Bft: Interi alberi agitati</string>
+    <string name="bft_8">8 Bft: Ramoscelli strappati dagli alberi</string>
+    <string name="bft_9">9 Bft: Danni da tempesta</string>
+    <string name="front">da davanti</string>
+    <string name="back">da dietro</string>
+    <string name="left">da sinistra</string>
+    <string name="right">da destra</string>
+    <string name="left_front">da anteriore sinistra</string>
+    <string name="right_front">da anteriore destra</string>
+    <string name="left_back">da posteriore sinistra</string>
+    <string name="right_back">da posteriore destra</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Volée %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d sessione</item>
+        <item quantity="other">%d sessioni</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d freccia</item>
+        <item quantity="other">%1$d \u00D7 %2$d frecce</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d freccia per volée</item>
+        <item quantity="other">%d frecce per volée</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-it/target_faces.xml b/shared/src/main/res/values-it/target_faces.xml
index d24bcb47a..f754f2dbb 100644
--- a/shared/src/main/res/values-it/target_faces.xml
+++ b/shared/src/main/res/values-it/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regolamentari</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Colpito o mancato</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-iw/rounds.xml b/shared/src/main/res/values-iw/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-iw/rounds.xml
+++ b/shared/src/main/res/values-iw/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-iw/strings.xml b/shared/src/main/res/values-iw/strings.xml
index ffec3451a..526ae26f2 100644
--- a/shared/src/main/res/values-iw/strings.xml
+++ b/shared/src/main/res/values-iw/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">קימור קשת</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">קשת ארוכה</string>
-  <string name="horse_bow">קשת סוס</string>
-  <string name="yumi">יומי</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="two">%d rounds</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="two">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="two">%d arrows per end</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">קימור קשת</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">קשת ארוכה</string>
+    <string name="horse_bow">קשת סוס</string>
+    <string name="yumi">יומי</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="two">%d rounds</item>
+        <item quantity="many">%d rounds</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="two">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="two">%d arrows per end</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-iw/target_faces.xml b/shared/src/main/res/values-iw/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-iw/target_faces.xml
+++ b/shared/src/main/res/values-iw/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ja/rounds.xml b/shared/src/main/res/values-ja/rounds.xml
index c9e97395e..5ab0f21e2 100644
--- a/shared/src/main/res/values-ja/rounds.xml
+++ b/shared/src/main/res/values-ja/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 女子マスター 70 +</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 女子マスター 70 +</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ja/strings.xml b/shared/src/main/res/values-ja/strings.xml
index b48b23920..f30891e9a 100644
--- a/shared/src/main/res/values-ja/strings.xml
+++ b/shared/src/main/res/values-ja/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">リカーブボウ</string>
-  <string name="compound_bow">コンパウンドボウ</string>
-  <string name="bare_bow">ベアボウ</string>
-  <string name="long_bow">ロング ボウ</string>
-  <string name="horse_bow">ホースボウ</string>
-  <string name="yumi">和弓</string>
-  <string name="sunny">晴れ</string>
-  <string name="partly_cloudy">曇り時々晴れ</string>
-  <string name="cloudy">曇り</string>
-  <string name="light_rain">時々雨</string>
-  <string name="rain">雨</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">ミニ</string>
-  <string name="small">スモール</string>
-  <string name="medium">ミディアム</string>
-  <string name="large">ラージ</string>
-  <string name="xlarge">エクストララージ</string>
-  <string name="unknown">不明</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">リカーブボウ</string>
+    <string name="compound_bow">コンパウンドボウ</string>
+    <string name="bare_bow">ベアボウ</string>
+    <string name="long_bow">ロング ボウ</string>
+    <string name="horse_bow">ホースボウ</string>
+    <string name="yumi">和弓</string>
+    <string name="sunny">晴れ</string>
+    <string name="partly_cloudy">曇り時々晴れ</string>
+    <string name="cloudy">曇り</string>
+    <string name="light_rain">時々雨</string>
+    <string name="rain">雨</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">ミニ</string>
+    <string name="small">スモール</string>
+    <string name="medium">ミディアム</string>
+    <string name="large">ラージ</string>
+    <string name="xlarge">エクストララージ</string>
+    <string name="unknown">不明</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ja/target_faces.xml b/shared/src/main/res/values-ja/target_faces.xml
index 648c789e4..ac3300b0b 100644
--- a/shared/src/main/res/values-ja/target_faces.xml
+++ b/shared/src/main/res/values-ja/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA フル</string>
-  <string name="wa_6_ring">WA インナー6</string>
-  <string name="wa_5_ring">WA 5 リング</string>
-  <string name="wa_3_ring">WA インナー3</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA フィールド</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFA フィールド</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA フル</string>
+    <string name="wa_6_ring">WA インナー6</string>
+    <string name="wa_5_ring">WA 5 リング</string>
+    <string name="wa_3_ring">WA インナー3</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA フィールド</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFA フィールド</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ko/rounds.xml b/shared/src/main/res/values-ko/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-ko/rounds.xml
+++ b/shared/src/main/res/values-ko/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ko/strings.xml b/shared/src/main/res/values-ko/strings.xml
index 66eaca862..381eda8ed 100644
--- a/shared/src/main/res/values-ko/strings.xml
+++ b/shared/src/main/res/values-ko/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d 화살 (%4$s 면)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">샷 %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ko/target_faces.xml b/shared/src/main/res/values-ko/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-ko/target_faces.xml
+++ b/shared/src/main/res/values-ko/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-nl/rounds.xml b/shared/src/main/res/values-nl/rounds.xml
index eb89ad6bc..bd57741d8 100644
--- a/shared/src/main/res/values-nl/rounds.xml
+++ b/shared/src/main/res/values-nl/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australische gecombineerde Indoor</string>
-  <string name="australian_indoor_1">Australische Indoor 1</string>
-  <string name="australian_indoor_2">Australische Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Gecombineerd</string>
-  <string name="match_round">Wedstrijdronde</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worchester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 1500 Indoor: Volwassenen/Jeugd</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 binnen: Junior</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Junior</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Eliminatie 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Eliminatie 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Eliminatie 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Eliminatie 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Eliminatie 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Eliminatie 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Eliminatie 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet mannen</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet vrouwen</string>
-  <string name="wa_compound_individual">WA Compound Individueel</string>
-  <string name="wa_compound_qualification">WA Compound Kwalificatie</string>
-  <string name="wa_cub">WA Jeugd</string>
-  <string name="wa_standard">WA standaard</string>
-  <string name="olympic_round">Olympische ronde</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior mannen</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior vrouwen</string>
-  <string name="wa_1440_men_master_50">WA 1440 mannen master 50 +</string>
-  <string name="wa_1440_men_master_60">WA 1440 mannen master 60 +</string>
-  <string name="wa_1440_men_master_70">WA 1440 mannen master 70 +</string>
-  <string name="wa_1440_men_senior">WA 1440 mannen Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 vrouwen master 50 +</string>
-  <string name="wa_1440_women_master_60">WA 1440 vrouwen master 60 +</string>
-  <string name="wa_1440_women_master_70">WA 1440 vrouwen master 70 +</string>
-  <string name="wa_1440_women_senior">WA 1440 vrouwen Senior</string>
-  <string name="half_wa_1440_cadet_men">Halve WA 1440 Cadet mannen</string>
-  <string name="half_wa_1440_cadet_women">Halve WA 1440 Cadet vrouwen</string>
-  <string name="half_wa_1440_junior_men">Halve WA 1440 Junior mannen</string>
-  <string name="half_wa_1440_junior_women">Halve WA 1440 Junior vrouwen</string>
-  <string name="half_wa_1440_men_master_50">Halve WA 1440 mannen master 50 +</string>
-  <string name="half_wa_1440_men_master_60">Halve WA 1440 mannen master 60 +</string>
-  <string name="half_wa_1440_men_master_70">Halve WA 1440 mannen master 70 +</string>
-  <string name="half_wa_1440_men_senior">Halve WA 1440 mannen Senior</string>
-  <string name="half_wa_1440_women_master_50">Halve WA 1440 vrouwen master 50 +</string>
-  <string name="half_wa_1440_women_master_60">Halve WA 1440 vrouwen master 60 +</string>
-  <string name="half_wa_1440_women_master_70">Halve WA 1440 vrouwen master 70 +</string>
-  <string name="half_wa_1440_women_senior">Halve WA 1440 vrouwen Senior</string>
-  <string name="wa_double_720_30_80cm">WA dubbele 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA dubbele 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA dubbele 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA dubbele 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA dubbele 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA dubbele 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA dubbele 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Amerikaanse</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior Natioinaal</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsdor</string>
-  <string name="junior_national">Junior Nationaal</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short Nationaal</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">Nationaal</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long Nationaal</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">Nieuwe Nationale</string>
-  <string name="new_warwick">Nieuwe Warwick</string>
-  <string name="new_western">Nieuwe Western</string>
-  <string name="frostbite">Bevriezing</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (heren)</string>
-  <string name="long_metric_ladies">Long Metric (dames)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Tussenliggend</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsvile</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/jeugd</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/jeugd</string>
-  <string name="nfaa_810">NFAA/Amerikaanse 810</string>
-  <string name="nfaa_810_cub">NFAA/Amerikaanse 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/Amerikaanse 810: Junior/jeugd</string>
-  <string name="nfaa_900">NFAA/Amerikaanse 900</string>
-  <string name="nfaa_900_cub">NFAA/Amerikaanse 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/Amerikaanse 900: Junior/jeugd</string>
-  <string name="canadian_900">Canadese 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA veld 12 ongemarkeerd/12 gemarkeerd: Rode pins</string>
-  <string name="wa_field_marked_12_red">WA veld gemarkeerd 12: Rode pin</string>
-  <string name="wa_field_marked_24_red">WA veld gemarkeerd 24: Rode pin</string>
-  <string name="wa_field_unmarked_12_red">WA Field ongemarkeerd 12: Rode pin</string>
-  <string name="wa_field_unmarked_24_red">WA Field ongemarkeerd 24: Rode pin</string>
-  <string name="wa_field_unmarked_marked_blue">WA veld 12 ongemarkeerd/12 gemarkeerd: Blauwe pin</string>
-  <string name="wa_field_marked_12_blue">WA veld gemarkeerd 12: Blauwe pin</string>
-  <string name="wa_field_marked_24_blue">WA veld gemarkeerd 24: Blauwe pin</string>
-  <string name="wa_field_unmarked_12_blue">WA Field ongemarkeerd 12: Blauwe pin</string>
-  <string name="wa_field_unmarked_24_blue">WA Field ongemarkeerd 24: Blauwe pin</string>
-  <string name="wa_field_unmarked_marked_yellow">WA veld 12 ongemarkeerd/12 gemarkeerd: Gele pin</string>
-  <string name="wa_field_marked_12_yellow">WA veld gemarkeerd 12: Gele pin</string>
-  <string name="wa_field_marked_24_yellow">WA veld gemarkeerd 24: Gele pin</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field ongemarkeerd 12: Gele pin</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field ongemarkeerd 24: Gele pin</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australische gecombineerde Indoor</string>
+    <string name="australian_indoor_1">Australische Indoor 1</string>
+    <string name="australian_indoor_2">Australische Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Gecombineerd</string>
+    <string name="match_round">Wedstrijdronde</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worchester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 1500 Indoor: Volwassenen/Jeugd</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 binnen: Junior</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Junior</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Eliminatie 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Eliminatie 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Eliminatie 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Eliminatie 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Eliminatie 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Eliminatie 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Eliminatie 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet mannen</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet vrouwen</string>
+    <string name="wa_compound_individual">WA Compound Individueel</string>
+    <string name="wa_compound_qualification">WA Compound Kwalificatie</string>
+    <string name="wa_cub">WA Jeugd</string>
+    <string name="wa_standard">WA standaard</string>
+    <string name="olympic_round">Olympische ronde</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior mannen</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior vrouwen</string>
+    <string name="wa_1440_men_master_50">WA 1440 mannen master 50 +</string>
+    <string name="wa_1440_men_master_60">WA 1440 mannen master 60 +</string>
+    <string name="wa_1440_men_master_70">WA 1440 mannen master 70 +</string>
+    <string name="wa_1440_men_senior">WA 1440 mannen Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 vrouwen master 50 +</string>
+    <string name="wa_1440_women_master_60">WA 1440 vrouwen master 60 +</string>
+    <string name="wa_1440_women_master_70">WA 1440 vrouwen master 70 +</string>
+    <string name="wa_1440_women_senior">WA 1440 vrouwen Senior</string>
+    <string name="half_wa_1440_cadet_men">Halve WA 1440 Cadet mannen</string>
+    <string name="half_wa_1440_cadet_women">Halve WA 1440 Cadet vrouwen</string>
+    <string name="half_wa_1440_junior_men">Halve WA 1440 Junior mannen</string>
+    <string name="half_wa_1440_junior_women">Halve WA 1440 Junior vrouwen</string>
+    <string name="half_wa_1440_men_master_50">Halve WA 1440 mannen master 50 +</string>
+    <string name="half_wa_1440_men_master_60">Halve WA 1440 mannen master 60 +</string>
+    <string name="half_wa_1440_men_master_70">Halve WA 1440 mannen master 70 +</string>
+    <string name="half_wa_1440_men_senior">Halve WA 1440 mannen Senior</string>
+    <string name="half_wa_1440_women_master_50">Halve WA 1440 vrouwen master 50 +</string>
+    <string name="half_wa_1440_women_master_60">Halve WA 1440 vrouwen master 60 +</string>
+    <string name="half_wa_1440_women_master_70">Halve WA 1440 vrouwen master 70 +</string>
+    <string name="half_wa_1440_women_senior">Halve WA 1440 vrouwen Senior</string>
+    <string name="wa_double_720_30_80cm">WA dubbele 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA dubbele 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA dubbele 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA dubbele 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA dubbele 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA dubbele 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA dubbele 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Amerikaanse</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior Natioinaal</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsdor</string>
+    <string name="junior_national">Junior Nationaal</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short Nationaal</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">Nationaal</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long Nationaal</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">Nieuwe Nationale</string>
+    <string name="new_warwick">Nieuwe Warwick</string>
+    <string name="new_western">Nieuwe Western</string>
+    <string name="frostbite">Bevriezing</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (heren)</string>
+    <string name="long_metric_ladies">Long Metric (dames)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Tussenliggend</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsvile</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/jeugd</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/jeugd</string>
+    <string name="nfaa_810">NFAA/Amerikaanse 810</string>
+    <string name="nfaa_810_cub">NFAA/Amerikaanse 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/Amerikaanse 810: Junior/jeugd</string>
+    <string name="nfaa_900">NFAA/Amerikaanse 900</string>
+    <string name="nfaa_900_cub">NFAA/Amerikaanse 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/Amerikaanse 900: Junior/jeugd</string>
+    <string name="canadian_900">Canadese 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA veld 12 ongemarkeerd/12 gemarkeerd: Rode pins</string>
+    <string name="wa_field_marked_12_red">WA veld gemarkeerd 12: Rode pin</string>
+    <string name="wa_field_marked_24_red">WA veld gemarkeerd 24: Rode pin</string>
+    <string name="wa_field_unmarked_12_red">WA Field ongemarkeerd 12: Rode pin</string>
+    <string name="wa_field_unmarked_24_red">WA Field ongemarkeerd 24: Rode pin</string>
+    <string name="wa_field_unmarked_marked_blue">WA veld 12 ongemarkeerd/12 gemarkeerd: Blauwe pin</string>
+    <string name="wa_field_marked_12_blue">WA veld gemarkeerd 12: Blauwe pin</string>
+    <string name="wa_field_marked_24_blue">WA veld gemarkeerd 24: Blauwe pin</string>
+    <string name="wa_field_unmarked_12_blue">WA Field ongemarkeerd 12: Blauwe pin</string>
+    <string name="wa_field_unmarked_24_blue">WA Field ongemarkeerd 24: Blauwe pin</string>
+    <string name="wa_field_unmarked_marked_yellow">WA veld 12 ongemarkeerd/12 gemarkeerd: Gele pin</string>
+    <string name="wa_field_marked_12_yellow">WA veld gemarkeerd 12: Gele pin</string>
+    <string name="wa_field_marked_24_yellow">WA veld gemarkeerd 24: Gele pin</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field ongemarkeerd 12: Gele pin</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field ongemarkeerd 24: Gele pin</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-nl/strings.xml b/shared/src/main/res/values-nl/strings.xml
index bca522637..e3f9f6a53 100644
--- a/shared/src/main/res/values-nl/strings.xml
+++ b/shared/src/main/res/values-nl/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve boog</string>
-  <string name="compound_bow">Compound boog</string>
-  <string name="bare_bow">Kale boog</string>
-  <string name="long_bow">Longbow</string>
-  <string name="horse_bow">Ruiter boog</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Zonnig</string>
-  <string name="partly_cloudy">Halfbewolkt</string>
-  <string name="cloudy">Bewolkt</string>
-  <string name="light_rain">Lichte regen</string>
-  <string name="rain">Regen</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d pijlen (%4$s blazoen)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Klein</string>
-  <string name="medium">Middelgroot</string>
-  <string name="large">Groot</string>
-  <string name="xlarge">Extra groot</string>
-  <string name="unknown">Onbekend</string>
-  <string name="indoor">Binnen</string>
-  <string name="wind">Wind</string>
-  <string name="location">Locatie</string>
-  <string name="bft_0">0 Bft: windstil</string>
-  <string name="bft_1">1 Bft: bladeren bewegen niet</string>
-  <string name="bft_2">2 Bft: bladeren beginnen te bewegen</string>
-  <string name="bft_3">3 Bft: vlaggen beginnen te bewegen</string>
-  <string name="bft_4">4 Bft: kleine takken beginnen te bewegen</string>
-  <string name="bft_5">5 Bft: kleine bomen bewegen</string>
-  <string name="bft_6">6 Bft: grote takken bewegen</string>
-  <string name="bft_7">7 Bft: Complete bomen bewegen</string>
-  <string name="bft_8">8 Bft: kleine takken breken</string>
-  <string name="bft_9">9 Bft: Storm schade</string>
-  <string name="front">van voren</string>
-  <string name="back">van achteren</string>
-  <string name="left">van links</string>
-  <string name="right">van rechts</string>
-  <string name="left_front">van linksvoor</string>
-  <string name="right_front">van rechtsvoor</string>
-  <string name="left_back">van linksachter</string>
-  <string name="right_back">van rechtsachter</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Beurt %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d ronde</item>
-    <item quantity="other">%d rondes</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d pijl</item>
-    <item quantity="other">%1$d \u00D7 %2$d pijlen</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d pijl per beurt</item>
-    <item quantity="other">%d pijlen per beurt</item>
-  </plurals>
+    <string name="recurve_bow">Recurve boog</string>
+    <string name="compound_bow">Compound boog</string>
+    <string name="bare_bow">Kale boog</string>
+    <string name="long_bow">Longbow</string>
+    <string name="horse_bow">Ruiter boog</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Zonnig</string>
+    <string name="partly_cloudy">Halfbewolkt</string>
+    <string name="cloudy">Bewolkt</string>
+    <string name="light_rain">Lichte regen</string>
+    <string name="rain">Regen</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d pijlen (%4$s blazoen)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Klein</string>
+    <string name="medium">Middelgroot</string>
+    <string name="large">Groot</string>
+    <string name="xlarge">Extra groot</string>
+    <string name="unknown">Onbekend</string>
+    <string name="indoor">Binnen</string>
+    <string name="wind">Wind</string>
+    <string name="location">Locatie</string>
+    <string name="bft_0">0 Bft: windstil</string>
+    <string name="bft_1">1 Bft: bladeren bewegen niet</string>
+    <string name="bft_2">2 Bft: bladeren beginnen te bewegen</string>
+    <string name="bft_3">3 Bft: vlaggen beginnen te bewegen</string>
+    <string name="bft_4">4 Bft: kleine takken beginnen te bewegen</string>
+    <string name="bft_5">5 Bft: kleine bomen bewegen</string>
+    <string name="bft_6">6 Bft: grote takken bewegen</string>
+    <string name="bft_7">7 Bft: Complete bomen bewegen</string>
+    <string name="bft_8">8 Bft: kleine takken breken</string>
+    <string name="bft_9">9 Bft: Storm schade</string>
+    <string name="front">van voren</string>
+    <string name="back">van achteren</string>
+    <string name="left">van links</string>
+    <string name="right">van rechts</string>
+    <string name="left_front">van linksvoor</string>
+    <string name="right_front">van rechtsvoor</string>
+    <string name="left_back">van linksachter</string>
+    <string name="right_back">van rechtsachter</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Beurt %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d ronde</item>
+        <item quantity="other">%d rondes</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d pijl</item>
+        <item quantity="other">%1$d \u00D7 %2$d pijlen</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d pijl per beurt</item>
+        <item quantity="other">%d pijlen per beurt</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-nl/target_faces.xml b/shared/src/main/res/values-nl/target_faces.xml
index 1a8c9fcff..289041e28 100644
--- a/shared/src/main/res/values-nl/target_faces.xml
+++ b/shared/src/main/res/values-nl/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Normaal</string>
-  <string name="target_type_field_archery">Veld</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Volledig</string>
-  <string name="wa_6_ring">WA 6 Ringen</string>
-  <string name="wa_5_ring">WA 5 Ringen</string>
-  <string name="wa_3_ring">WA 3 Ringen</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">Dutch Target</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ringen 3 Spot</string>
-  <string name="nfaa_field">NFAA veld</string>
-  <string name="nfaa_expert_field">NFAA Expert Veld</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA veld</string>
-  <string name="hit_or_miss">Raak of mis</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D-ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D-NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA dier</string>
-  <string name="nfaa_animal">NFAA dier</string>
-  <string name="nfas_field">NFAS veld</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA periode</string>
-  <string name="wa_field_3_spot">WA veld 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blaaspijp</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve stijl (X-1)</string>
-  <string name="recurve_style_10_1">Recurve stijl (10-1)</string>
-  <string name="recurve_style_x_5">Recurve stijl (X-5)</string>
-  <string name="recurve_style_10_5">Recurve stijl (10-5)</string>
-  <string name="recurve_style_x_6">Recurve stijl (X-6)</string>
-  <string name="recurve_style_10_6">Recurve stijl (10-6)</string>
-  <string name="recurve_style_x_8">Recurve stijl (X-8)</string>
-  <string name="recurve_style_10_8">Recurve stijl (10-8)</string>
-  <string name="compound_style">Compound stijl</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Normaal</string>
+    <string name="target_type_field_archery">Veld</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Volledig</string>
+    <string name="wa_6_ring">WA 6 Ringen</string>
+    <string name="wa_5_ring">WA 5 Ringen</string>
+    <string name="wa_3_ring">WA 3 Ringen</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">Dutch Target</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ringen 3 Spot</string>
+    <string name="nfaa_field">NFAA veld</string>
+    <string name="nfaa_expert_field">NFAA Expert Veld</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA veld</string>
+    <string name="hit_or_miss">Raak of mis</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D-ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D-NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA dier</string>
+    <string name="nfaa_animal">NFAA dier</string>
+    <string name="nfas_field">NFAS veld</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA periode</string>
+    <string name="wa_field_3_spot">WA veld 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blaaspijp</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve stijl (X-1)</string>
+    <string name="recurve_style_10_1">Recurve stijl (10-1)</string>
+    <string name="recurve_style_x_5">Recurve stijl (X-5)</string>
+    <string name="recurve_style_10_5">Recurve stijl (10-5)</string>
+    <string name="recurve_style_x_6">Recurve stijl (X-6)</string>
+    <string name="recurve_style_10_6">Recurve stijl (10-6)</string>
+    <string name="recurve_style_x_8">Recurve stijl (X-8)</string>
+    <string name="recurve_style_10_8">Recurve stijl (10-8)</string>
+    <string name="compound_style">Compound stijl</string>
 </resources>
diff --git a/shared/src/main/res/values-no/rounds.xml b/shared/src/main/res/values-no/rounds.xml
index c51115e99..841651de4 100644
--- a/shared/src/main/res/values-no/rounds.xml
+++ b/shared/src/main/res/values-no/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australsk kombinert innendørs</string>
-  <string name="australian_indoor_1">Australsk innendørs 1</string>
-  <string name="australian_indoor_2">Australsk innendørs 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA kombinert</string>
-  <string name="match_round">Match runde</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 innendørs: voksen/ungdom</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 innendørs: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman innendørs</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA induviduell Compound eliminering 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA induviduell Compound eliminering 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA induviduell Compound eliminering 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 kadet menn</string>
-  <string name="wa_1440_cadet_women">WA 1440 kadet kvinner</string>
-  <string name="wa_compound_individual">WA Compound induviduelt</string>
-  <string name="wa_compound_qualification">WA Compound kvalifisering</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympisk runde</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior menn</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior kvinner</string>
-  <string name="wa_1440_men_master_50">WA 1440 menn Master 50 +</string>
-  <string name="wa_1440_men_master_60">WA 1440 menn Master 60 +</string>
-  <string name="wa_1440_men_master_70">WA 1440 menn Master 70 +</string>
-  <string name="wa_1440_men_senior">WA 1440 menn Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 kvinner Master 50 +</string>
-  <string name="wa_1440_women_master_60">WA 1440 kvinner Master 60 +</string>
-  <string name="wa_1440_women_master_70">WA 1440 kvinner Master 70 +</string>
-  <string name="wa_1440_women_senior">WA 1440 kvinner Senior</string>
-  <string name="half_wa_1440_cadet_men">Halv WA 1440 kadet menn</string>
-  <string name="half_wa_1440_cadet_women">Halv WA 1440 kadet kvinner</string>
-  <string name="half_wa_1440_junior_men">Halv WA 1440 Junior menn</string>
-  <string name="half_wa_1440_junior_women">Halv WA 1440 Junior kvinner</string>
-  <string name="half_wa_1440_men_master_50">Halv WA 1440 menn Master 50 +</string>
-  <string name="half_wa_1440_men_master_60">Halv WA 1440 menn Master 60 +</string>
-  <string name="half_wa_1440_men_master_70">Halv WA 1440 menn Master 70 +</string>
-  <string name="half_wa_1440_men_senior">Halv WA 1440 menn Senior</string>
-  <string name="half_wa_1440_women_master_50">Halv WA 1440 kvinner Master 50 +</string>
-  <string name="half_wa_1440_women_master_60">Halv WA 1440 kvinner Master 60 +</string>
-  <string name="half_wa_1440_women_master_70">Halv WA 1440 kvinner Master 70 +</string>
-  <string name="half_wa_1440_women_senior">Halv WA 1440 kvinner Senior</string>
-  <string name="wa_double_720_30_80cm">WA dobbel 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA dobbel 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA dobbel 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA dobbel 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA dobbel 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA dobbel 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA dobbel 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">Ny nasjonal</string>
-  <string name="new_warwick">Ny Warwick</string>
-  <string name="new_western">Ny Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (herrer)</string>
-  <string name="long_metric_ladies">Long Metric (damer)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Lang Brisbane</string>
-  <string name="long_sydney">Lang Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Kort Adelaide</string>
-  <string name="short_canberra">Kort Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/ungdom</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/ungdom</string>
-  <string name="nfaa_810">NFAA/american 810</string>
-  <string name="nfaa_810_cub">NFAA/amerikansk 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/amerikansk 810: Junior/ungdom</string>
-  <string name="nfaa_900">NFAA/american 900</string>
-  <string name="nfaa_900_cub">NFAA/american 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/american 900: Junior/ungdom</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA dyr 280</string>
-  <string name="ifaa_animal_300">IFAA dyr 300</string>
-  <string name="ifaa_animal_560">IFAA dyr 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA dyr 280</string>
-  <string name="nfaa_animal_300">NFAA dyr 300</string>
-  <string name="nfaa_animal_588">NFAA dyr 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA felt 12 uoppmålt/12 oppmålt: Rød påle</string>
-  <string name="wa_field_marked_12_red">WA felt oppmålt 12: Rød påle</string>
-  <string name="wa_field_marked_24_red">WA felt 24 oppmålt: Rød påle</string>
-  <string name="wa_field_unmarked_12_red">WA felt 12 uoppmålt: Rød påle</string>
-  <string name="wa_field_unmarked_24_red">WA felt 24 uoppmålt: Rød påle</string>
-  <string name="wa_field_unmarked_marked_blue">WA felt 12 uoppmålt/12 oppmålt: Blå påle</string>
-  <string name="wa_field_marked_12_blue">WA felt 12 oppmålt: Blå påle</string>
-  <string name="wa_field_marked_24_blue">WA felt oppmålt 24: Blå påle</string>
-  <string name="wa_field_unmarked_12_blue">WA felt 12 uoppmålt: Blå påle</string>
-  <string name="wa_field_unmarked_24_blue">WA felt 24 uoppmålt: Blå påle</string>
-  <string name="wa_field_unmarked_marked_yellow">WA felt 12 uoppmålt/12 oppmålt: Gul påle</string>
-  <string name="wa_field_marked_12_yellow">WA felt 12 oppmålt: Gul påle</string>
-  <string name="wa_field_marked_24_yellow">WA felt 24 oppmålt: Gul påle</string>
-  <string name="wa_field_unmarked_12_yellow">WA felt 12 uoppmålt: Gul påle</string>
-  <string name="wa_field_unmarked_24_yellow">WA felt 24 uoppmålt: Gul påle</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australsk kombinert innendørs</string>
+    <string name="australian_indoor_1">Australsk innendørs 1</string>
+    <string name="australian_indoor_2">Australsk innendørs 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA kombinert</string>
+    <string name="match_round">Match runde</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 innendørs: voksen/ungdom</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 innendørs: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman innendørs</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA induviduell Compound eliminering 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA induviduell Compound eliminering 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA induviduell Compound eliminering 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 kadet menn</string>
+    <string name="wa_1440_cadet_women">WA 1440 kadet kvinner</string>
+    <string name="wa_compound_individual">WA Compound induviduelt</string>
+    <string name="wa_compound_qualification">WA Compound kvalifisering</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympisk runde</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior menn</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior kvinner</string>
+    <string name="wa_1440_men_master_50">WA 1440 menn Master 50 +</string>
+    <string name="wa_1440_men_master_60">WA 1440 menn Master 60 +</string>
+    <string name="wa_1440_men_master_70">WA 1440 menn Master 70 +</string>
+    <string name="wa_1440_men_senior">WA 1440 menn Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 kvinner Master 50 +</string>
+    <string name="wa_1440_women_master_60">WA 1440 kvinner Master 60 +</string>
+    <string name="wa_1440_women_master_70">WA 1440 kvinner Master 70 +</string>
+    <string name="wa_1440_women_senior">WA 1440 kvinner Senior</string>
+    <string name="half_wa_1440_cadet_men">Halv WA 1440 kadet menn</string>
+    <string name="half_wa_1440_cadet_women">Halv WA 1440 kadet kvinner</string>
+    <string name="half_wa_1440_junior_men">Halv WA 1440 Junior menn</string>
+    <string name="half_wa_1440_junior_women">Halv WA 1440 Junior kvinner</string>
+    <string name="half_wa_1440_men_master_50">Halv WA 1440 menn Master 50 +</string>
+    <string name="half_wa_1440_men_master_60">Halv WA 1440 menn Master 60 +</string>
+    <string name="half_wa_1440_men_master_70">Halv WA 1440 menn Master 70 +</string>
+    <string name="half_wa_1440_men_senior">Halv WA 1440 menn Senior</string>
+    <string name="half_wa_1440_women_master_50">Halv WA 1440 kvinner Master 50 +</string>
+    <string name="half_wa_1440_women_master_60">Halv WA 1440 kvinner Master 60 +</string>
+    <string name="half_wa_1440_women_master_70">Halv WA 1440 kvinner Master 70 +</string>
+    <string name="half_wa_1440_women_senior">Halv WA 1440 kvinner Senior</string>
+    <string name="wa_double_720_30_80cm">WA dobbel 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA dobbel 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA dobbel 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA dobbel 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA dobbel 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA dobbel 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA dobbel 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">Ny nasjonal</string>
+    <string name="new_warwick">Ny Warwick</string>
+    <string name="new_western">Ny Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (herrer)</string>
+    <string name="long_metric_ladies">Long Metric (damer)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Lang Brisbane</string>
+    <string name="long_sydney">Lang Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Kort Adelaide</string>
+    <string name="short_canberra">Kort Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/ungdom</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/ungdom</string>
+    <string name="nfaa_810">NFAA/american 810</string>
+    <string name="nfaa_810_cub">NFAA/amerikansk 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/amerikansk 810: Junior/ungdom</string>
+    <string name="nfaa_900">NFAA/american 900</string>
+    <string name="nfaa_900_cub">NFAA/american 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/american 900: Junior/ungdom</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA dyr 280</string>
+    <string name="ifaa_animal_300">IFAA dyr 300</string>
+    <string name="ifaa_animal_560">IFAA dyr 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA dyr 280</string>
+    <string name="nfaa_animal_300">NFAA dyr 300</string>
+    <string name="nfaa_animal_588">NFAA dyr 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA felt 12 uoppmålt/12 oppmålt: Rød påle</string>
+    <string name="wa_field_marked_12_red">WA felt oppmålt 12: Rød påle</string>
+    <string name="wa_field_marked_24_red">WA felt 24 oppmålt: Rød påle</string>
+    <string name="wa_field_unmarked_12_red">WA felt 12 uoppmålt: Rød påle</string>
+    <string name="wa_field_unmarked_24_red">WA felt 24 uoppmålt: Rød påle</string>
+    <string name="wa_field_unmarked_marked_blue">WA felt 12 uoppmålt/12 oppmålt: Blå påle</string>
+    <string name="wa_field_marked_12_blue">WA felt 12 oppmålt: Blå påle</string>
+    <string name="wa_field_marked_24_blue">WA felt oppmålt 24: Blå påle</string>
+    <string name="wa_field_unmarked_12_blue">WA felt 12 uoppmålt: Blå påle</string>
+    <string name="wa_field_unmarked_24_blue">WA felt 24 uoppmålt: Blå påle</string>
+    <string name="wa_field_unmarked_marked_yellow">WA felt 12 uoppmålt/12 oppmålt: Gul påle</string>
+    <string name="wa_field_marked_12_yellow">WA felt 12 oppmålt: Gul påle</string>
+    <string name="wa_field_marked_24_yellow">WA felt 24 oppmålt: Gul påle</string>
+    <string name="wa_field_unmarked_12_yellow">WA felt 12 uoppmålt: Gul påle</string>
+    <string name="wa_field_unmarked_24_yellow">WA felt 24 uoppmålt: Gul påle</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-no/strings.xml b/shared/src/main/res/values-no/strings.xml
index 8f14d081b..67612784a 100644
--- a/shared/src/main/res/values-no/strings.xml
+++ b/shared/src/main/res/values-no/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve</string>
-  <string name="compound_bow">Compound</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Lang bue</string>
-  <string name="horse_bow">Rytter bue</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sol</string>
-  <string name="partly_cloudy">Delvis skyet</string>
-  <string name="cloudy">Overskyet</string>
-  <string name="light_rain">Lett regn</string>
-  <string name="rain">Regnfullt</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Liten</string>
-  <string name="medium">Medium</string>
-  <string name="large">Stor</string>
-  <string name="xlarge">XStor</string>
-  <string name="unknown">Ukjent</string>
-  <string name="indoor">Innendørs</string>
-  <string name="wind">Vind</string>
-  <string name="location">Sted</string>
-  <string name="bft_0">0 Bft: vindstille</string>
-  <string name="bft_1">1 Bft: bladene beveger seg ikke</string>
-  <string name="bft_2">2 Bft: Bladene begynner å bevege seg</string>
-  <string name="bft_3">3 Bft: Lette flagg begynner å bevege seg</string>
-  <string name="bft_4">4 Bft: Små greiner begynner å bevege seg</string>
-  <string name="bft_5">5 Bft: Små trær beveger seg</string>
-  <string name="bft_6">6 Bft: Store grener beveger seg</string>
-  <string name="bft_7">5 Bft: Trær beveger seg</string>
-  <string name="bft_8">8 Bft: Små greiner Knekker</string>
-  <string name="bft_9">9 Bft: Storm styrke</string>
-  <string name="front">forfra</string>
-  <string name="back">bakfra</string>
-  <string name="left">fra venstre</string>
-  <string name="right">fra høyre</string>
-  <string name="left_front">fra foran til venstre</string>
-  <string name="right_front">fra foran til høyre</string>
-  <string name="left_back">fra bak til venstre</string>
-  <string name="right_back">fra bak til høyre</string>
-  <string name="stop">STOPP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve</string>
+    <string name="compound_bow">Compound</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Lang bue</string>
+    <string name="horse_bow">Rytter bue</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sol</string>
+    <string name="partly_cloudy">Delvis skyet</string>
+    <string name="cloudy">Overskyet</string>
+    <string name="light_rain">Lett regn</string>
+    <string name="rain">Regnfullt</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Liten</string>
+    <string name="medium">Medium</string>
+    <string name="large">Stor</string>
+    <string name="xlarge">XStor</string>
+    <string name="unknown">Ukjent</string>
+    <string name="indoor">Innendørs</string>
+    <string name="wind">Vind</string>
+    <string name="location">Sted</string>
+    <string name="bft_0">0 Bft: vindstille</string>
+    <string name="bft_1">1 Bft: bladene beveger seg ikke</string>
+    <string name="bft_2">2 Bft: Bladene begynner å bevege seg</string>
+    <string name="bft_3">3 Bft: Lette flagg begynner å bevege seg</string>
+    <string name="bft_4">4 Bft: Små greiner begynner å bevege seg</string>
+    <string name="bft_5">5 Bft: Små trær beveger seg</string>
+    <string name="bft_6">6 Bft: Store grener beveger seg</string>
+    <string name="bft_7">5 Bft: Trær beveger seg</string>
+    <string name="bft_8">8 Bft: Små greiner Knekker</string>
+    <string name="bft_9">9 Bft: Storm styrke</string>
+    <string name="front">forfra</string>
+    <string name="back">bakfra</string>
+    <string name="left">fra venstre</string>
+    <string name="right">fra høyre</string>
+    <string name="left_front">fra foran til venstre</string>
+    <string name="right_front">fra foran til høyre</string>
+    <string name="left_back">fra bak til venstre</string>
+    <string name="right_back">fra bak til høyre</string>
+    <string name="stop">STOPP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-no/target_faces.xml b/shared/src/main/res/values-no/target_faces.xml
index f0e5ef85b..7d83db883 100644
--- a/shared/src/main/res/values-no/target_faces.xml
+++ b/shared/src/main/res/values-no/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Vanlig</string>
-  <string name="target_type_field_archery">Felt</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA vertikal 3 spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA-felt</string>
-  <string name="nfaa_expert_field">NFAA expert felt</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA innendørs</string>
-  <string name="nfaa_indoor_5_spot">NFAA innendørs 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA-felt</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA dyr</string>
-  <string name="nfaa_animal">NFAA dyr</string>
-  <string name="nfas_field">NFAS felt</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA periode</string>
-  <string name="wa_field_3_spot">WA felt 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS farge (reversert 10-1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound stil</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Vanlig</string>
+    <string name="target_type_field_archery">Felt</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA vertikal 3 spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA-felt</string>
+    <string name="nfaa_expert_field">NFAA expert felt</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA innendørs</string>
+    <string name="nfaa_indoor_5_spot">NFAA innendørs 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA-felt</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA dyr</string>
+    <string name="nfaa_animal">NFAA dyr</string>
+    <string name="nfas_field">NFAS felt</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA periode</string>
+    <string name="wa_field_3_spot">WA felt 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS farge (reversert 10-1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound stil</string>
 </resources>
diff --git a/shared/src/main/res/values-pl/rounds.xml b/shared/src/main/res/values-pl/rounds.xml
index de1ae95fb..e18096b9b 100644
--- a/shared/src/main/res/values-pl/rounds.xml
+++ b/shared/src/main/res/values-pl/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">IFAA Animal 280</string>
-  <string name="nfaa_animal_300">IFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">IFAA Animal 280</string>
+    <string name="nfaa_animal_300">IFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-pl/strings.xml b/shared/src/main/res/values-pl/strings.xml
index db8681e25..1115ef4dc 100644
--- a/shared/src/main/res/values-pl/strings.xml
+++ b/shared/src/main/res/values-pl/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Łuk klasyczny</string>
-  <string name="compound_bow">Łuk bloczkowy</string>
-  <string name="bare_bow">Łuk goły</string>
-  <string name="long_bow">Łuk długi (angielski)</string>
-  <string name="horse_bow">Łuk krótki</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Słonecznie</string>
-  <string name="partly_cloudy">Częściowe zachmurzenie</string>
-  <string name="cloudy">Pochmurnie</string>
-  <string name="light_rain">Lekki deszcz</string>
-  <string name="rain">Deszczowy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d strzały (%4$s tarcza)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Mały</string>
-  <string name="medium">Średnio</string>
-  <string name="large">Duży</string>
-  <string name="xlarge">Bardzo duży</string>
-  <string name="unknown">Nieznany</string>
-  <string name="indoor">Halowe</string>
-  <string name="wind">Wiatr</string>
-  <string name="location">Lokalizacja</string>
-  <string name="bft_0">0 Bft: Bezwietrznie</string>
-  <string name="bft_1">1 Bft: Liście się nie ruszają</string>
-  <string name="bft_2">2 Bft: Liście zaczynają się poruszać</string>
-  <string name="bft_3">3 Bft: Lekkie flagi zaczynają się ruszać</string>
-  <string name="bft_4">4 Bft: małe gałęzie zaczynają się poruszać</string>
-  <string name="bft_5">5 Bft: Małe drzewa się poruszają</string>
-  <string name="bft_6">6 Bft: Duże gałęzie się ruszają</string>
-  <string name="bft_7">7 Bft: Drzewa się poruszają</string>
-  <string name="bft_8">8 Bft: Łamię się małe gałęzie</string>
-  <string name="bft_9">9 Bft: Sztorm</string>
-  <string name="front">z przodu</string>
-  <string name="back">z tyłu</string>
-  <string name="left">z lewej</string>
-  <string name="right">z prawej</string>
-  <string name="left_front">z lewego przodu</string>
-  <string name="right_front">z prawego przodu</string>
-  <string name="left_back">z lewego tyłu</string>
-  <string name="right_back">z prawego tyłu</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Koniec %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d runda</item>
-    <item quantity="few">%d rundy</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d rund</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d strzała</item>
-    <item quantity="few">%1$d \u00D7 %2$d strzał</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d strzał</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d strzała na koniec</item>
-    <item quantity="few">%d strzały na koniec</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d strzał na koniec</item>
-  </plurals>
+    <string name="recurve_bow">Łuk klasyczny</string>
+    <string name="compound_bow">Łuk bloczkowy</string>
+    <string name="bare_bow">Łuk goły</string>
+    <string name="long_bow">Łuk długi (angielski)</string>
+    <string name="horse_bow">Łuk krótki</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Słonecznie</string>
+    <string name="partly_cloudy">Częściowe zachmurzenie</string>
+    <string name="cloudy">Pochmurnie</string>
+    <string name="light_rain">Lekki deszcz</string>
+    <string name="rain">Deszczowy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d strzały (%4$s tarcza)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Mały</string>
+    <string name="medium">Średnio</string>
+    <string name="large">Duży</string>
+    <string name="xlarge">Bardzo duży</string>
+    <string name="unknown">Nieznany</string>
+    <string name="indoor">Halowe</string>
+    <string name="wind">Wiatr</string>
+    <string name="location">Lokalizacja</string>
+    <string name="bft_0">0 Bft: Bezwietrznie</string>
+    <string name="bft_1">1 Bft: Liście się nie ruszają</string>
+    <string name="bft_2">2 Bft: Liście zaczynają się poruszać</string>
+    <string name="bft_3">3 Bft: Lekkie flagi zaczynają się ruszać</string>
+    <string name="bft_4">4 Bft: małe gałęzie zaczynają się poruszać</string>
+    <string name="bft_5">5 Bft: Małe drzewa się poruszają</string>
+    <string name="bft_6">6 Bft: Duże gałęzie się ruszają</string>
+    <string name="bft_7">7 Bft: Drzewa się poruszają</string>
+    <string name="bft_8">8 Bft: Łamię się małe gałęzie</string>
+    <string name="bft_9">9 Bft: Sztorm</string>
+    <string name="front">z przodu</string>
+    <string name="back">z tyłu</string>
+    <string name="left">z lewej</string>
+    <string name="right">z prawej</string>
+    <string name="left_front">z lewego przodu</string>
+    <string name="right_front">z prawego przodu</string>
+    <string name="left_back">z lewego tyłu</string>
+    <string name="right_back">z prawego tyłu</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Seria %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d runda</item>
+        <item quantity="few">%d rundy</item>
+        <item quantity="many">%d rounds</item>
+        <item quantity="other">%d rund</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d strzała</item>
+        <item quantity="few">%1$d \u00D7 %2$d strzał</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d strzał</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d strzała na koniec</item>
+        <item quantity="few">%d strzały na koniec</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">%d strzał na serię</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-pl/target_faces.xml b/shared/src/main/res/values-pl/target_faces.xml
index cca2ab418..c63a503cd 100644
--- a/shared/src/main/res/values-pl/target_faces.xml
+++ b/shared/src/main/res/values-pl/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Standardowe</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Pełna</string>
-  <string name="wa_6_ring">WA 6 Pierścieni</string>
-  <string name="wa_5_ring">WA 5 Pierścieni</string>
-  <string name="wa_3_ring">WA 3 Pierścienie</string>
-  <string name="vegas_3_spot">Vegas 3 Strefy</string>
-  <string name="vertical_3_spot">WA Pionowa 3 Strefy</string>
-  <string name="wa_3_ring_3_spot">WA 3 Pierścienie 3 Strefy</string>
-  <string name="nfaa_field">NFAA Feld</string>
-  <string name="nfaa_expert_field">NFAA Expert Feld</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Halowe</string>
-  <string name="nfaa_indoor_5_spot">NFAA Halowe 5 Stref</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Feld</string>
-  <string name="hit_or_miss">Chybił/Trafił</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Strefy</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Strefy</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Stref</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Kolorowa (Odwrócona 10-1)</string>
-  <string name="recurve_style_x_1">Styl klasyczny (X–1)</string>
-  <string name="recurve_style_10_1">Styl klasyczny (10–1)</string>
-  <string name="recurve_style_x_5">Styl klasyczny (X–5)</string>
-  <string name="recurve_style_10_5">Styl klasyczny (10–5)</string>
-  <string name="recurve_style_x_6">Styl klasyczny (X–6)</string>
-  <string name="recurve_style_10_6">Styl klasyczny (10–6)</string>
-  <string name="recurve_style_x_8">Styl klasyczny (X–8)</string>
-  <string name="recurve_style_10_8">Styl klasyczny (10–8)</string>
-  <string name="compound_style">Styl bloczkowy</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Standardowe</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Pełna</string>
+    <string name="wa_6_ring">WA 6 Pierścieni</string>
+    <string name="wa_5_ring">WA 5 Pierścieni</string>
+    <string name="wa_3_ring">WA 3 Pierścienie</string>
+    <string name="vegas_3_spot">Vegas 3 Strefy</string>
+    <string name="vertical_3_spot">WA Pionowa 3 Strefy</string>
+    <string name="wa_3_ring_3_spot">WA 3 Pierścienie 3 Strefy</string>
+    <string name="nfaa_field">NFAA Feld</string>
+    <string name="nfaa_expert_field">NFAA Expert Feld</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Halowe</string>
+    <string name="nfaa_indoor_5_spot">NFAA Halowe 5 Stref</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Feld</string>
+    <string name="hit_or_miss">Chybił/Trafił</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Strefy</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Strefy</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Stref</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Kolorowa (Odwrócona 10-1)</string>
+    <string name="recurve_style_x_1">Styl klasyczny (X–1)</string>
+    <string name="recurve_style_10_1">Styl klasyczny (10–1)</string>
+    <string name="recurve_style_x_5">Styl klasyczny (X–5)</string>
+    <string name="recurve_style_10_5">Styl klasyczny (10–5)</string>
+    <string name="recurve_style_x_6">Styl klasyczny (X–6)</string>
+    <string name="recurve_style_10_6">Styl klasyczny (10–6)</string>
+    <string name="recurve_style_x_8">Styl klasyczny (X–8)</string>
+    <string name="recurve_style_10_8">Styl klasyczny (10–8)</string>
+    <string name="compound_style">Styl bloczkowy</string>
 </resources>
diff --git a/shared/src/main/res/values-pt-rBR/rounds.xml b/shared/src/main/res/values-pt-rBR/rounds.xml
index d03d74b46..a94dffcc1 100644
--- a/shared/src/main/res/values-pt-rBR/rounds.xml
+++ b/shared/src/main/res/values-pt-rBR/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
-  <string name="australian_indoor_1">Indoor Australiano 1</string>
-  <string name="australian_indoor_2">Indoor Australiano 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Alvos</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combinado</string>
-  <string name="match_round">Partida</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulto/Juvenil</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Infantil</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Infantil</string>
-  <string name="flint_bowman_indoor">Indoor Flint Bowman</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Eliminatória Composto Individual 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Eliminatória Composto Individual 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Eliminatória Composto Individual 50m</string>
-  <string name="wa_recurve_elimination_18">WA Eliminatória Recurvo 18m</string>
-  <string name="wa_recurve_elimination_50">WA Eliminatória Recurvo 50m</string>
-  <string name="wa_recurve_elimination_60">WA Eliminatória Recurvo 60m</string>
-  <string name="wa_recurve_elimination_70">WA Eliminatória Recurvo 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadete Feminino</string>
-  <string name="wa_compound_individual">WA Composto Individual</string>
-  <string name="wa_compound_qualification">WA Qualificação Composto</string>
-  <string name="wa_cub">WA Infantil</string>
-  <string name="wa_standard">WA Padrão</string>
-  <string name="olympic_round">Round Olímpico</string>
-  <string name="wa_1440_junior_men">WA 1440 Júnior Masculino</string>
-  <string name="wa_1440_junior_women">WA 1440 Júnior Feminino</string>
-  <string name="wa_1440_men_master_50">WA 1440 Master 50+ Masculino</string>
-  <string name="wa_1440_men_master_60">WA 1440 Master 60+ Masculino</string>
-  <string name="wa_1440_men_master_70">WA 1440 Master 70+ Masculino</string>
-  <string name="wa_1440_men_senior">WA 1440 Sênior Masculino</string>
-  <string name="wa_1440_women_master_50">WA 1440 Master 50+ Feminino</string>
-  <string name="wa_1440_women_master_60">WA 1440 Master 60+ Feminino</string>
-  <string name="wa_1440_women_master_70">WA 1440 Master 70+ Feminino</string>
-  <string name="wa_1440_women_senior">WA 1440 Sênior Feminino</string>
-  <string name="half_wa_1440_cadet_men">Meio WA 1440 Cadete Masculino</string>
-  <string name="half_wa_1440_cadet_women">Meio WA 1440 Cadete Feminino</string>
-  <string name="half_wa_1440_junior_men">Meio WA 1440 Júnior Masculino</string>
-  <string name="half_wa_1440_junior_women">Meio WA 1440 Júnior Feminino</string>
-  <string name="half_wa_1440_men_master_50">Meio WA 1440 Master 50+ Masculino</string>
-  <string name="half_wa_1440_men_master_60">Meio WA 1440 Master 60+ Masculino</string>
-  <string name="half_wa_1440_men_master_70">Meio WA 1440 Master 70+ Masculino</string>
-  <string name="half_wa_1440_men_senior">Meio WA 1440 Sênior Masculino</string>
-  <string name="half_wa_1440_women_master_50">Meio WA 1440 Master 50+ Feminino</string>
-  <string name="half_wa_1440_women_master_60">Meio WA 1440 Master 60+ Feminino</string>
-  <string name="half_wa_1440_women_master_70">Meio WA 1440 Master 70+ Feminino</string>
-  <string name="half_wa_1440_women_senior">Meio WA 1440 Sênior Feminino</string>
-  <string name="wa_double_720_30_80cm">WA duplo 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA duplo 720 30m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA 720 duplo 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA duplo 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA 720 duplo 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA 720 duplo 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA 720 duplo 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Júnior National</string>
-  <string name="short_junior_warwick">Short Júnior Warwick</string>
-  <string name="short_junior_western">Short Júnior Western</string>
-  <string name="short_junior_windsor">Short Júnior Windsor</string>
-  <string name="junior_national">Júnior National</string>
-  <string name="junior_warwick">Júnior Warwick</string>
-  <string name="junior_western">Júnior Western</string>
-  <string name="junior_windsor">Júnior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Métrico I</string>
-  <string name="metric_ii">Métrico II</string>
-  <string name="metric_iii">Métrico III</string>
-  <string name="metric_iv">Métrico IV</string>
-  <string name="metric_v">Métrico V</string>
-  <string name="long_metric_i">Longo Métrico I</string>
-  <string name="long_metric_ii">Longo Métrico II</string>
-  <string name="long_metric_iii">Longo Métrico III</string>
-  <string name="long_metric_iv">Longo Métrico IV</string>
-  <string name="long_metric_v">Longo Métrico V</string>
-  <string name="long_metric_gents">Longo Métrico (Cavalheiros)</string>
-  <string name="long_metric_ladies">Longo Métrico (Damas)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediário</string>
-  <string name="junior_canberra">Canberra Júnior</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 clássico/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 clássico/Dakota: Infantil</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 clássico/Dakota: Júnior/Juvenil</string>
-  <string name="nfaa_600_cub">NFAA 600: Infantil</string>
-  <string name="nfaa_600_junior">NFAA 600: Júnior/juvenil</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Infantil</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Júnior/Juvenil</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Infantil</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Júnior/Juvenil</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
+    <string name="australian_indoor_1">Indoor Australiano 1</string>
+    <string name="australian_indoor_2">Indoor Australiano 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Alvos</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combinado</string>
+    <string name="match_round">Partida</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulto/Juvenil</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Infantil</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Infantil</string>
+    <string name="flint_bowman_indoor">Indoor Flint Bowman</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Eliminatória Composto Individual 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Eliminatória Composto Individual 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Eliminatória Composto Individual 50m</string>
+    <string name="wa_recurve_elimination_18">WA Eliminatória Recurvo 18m</string>
+    <string name="wa_recurve_elimination_50">WA Eliminatória Recurvo 50m</string>
+    <string name="wa_recurve_elimination_60">WA Eliminatória Recurvo 60m</string>
+    <string name="wa_recurve_elimination_70">WA Eliminatória Recurvo 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadete Feminino</string>
+    <string name="wa_compound_individual">WA Composto Individual</string>
+    <string name="wa_compound_qualification">WA Qualificação Composto</string>
+    <string name="wa_cub">WA Infantil</string>
+    <string name="wa_standard">WA Padrão</string>
+    <string name="olympic_round">Round Olímpico</string>
+    <string name="wa_1440_junior_men">WA 1440 Júnior Masculino</string>
+    <string name="wa_1440_junior_women">WA 1440 Júnior Feminino</string>
+    <string name="wa_1440_men_master_50">WA 1440 Master 50+ Masculino</string>
+    <string name="wa_1440_men_master_60">WA 1440 Master 60+ Masculino</string>
+    <string name="wa_1440_men_master_70">WA 1440 Master 70+ Masculino</string>
+    <string name="wa_1440_men_senior">WA 1440 Sênior Masculino</string>
+    <string name="wa_1440_women_master_50">WA 1440 Master 50+ Feminino</string>
+    <string name="wa_1440_women_master_60">WA 1440 Master 60+ Feminino</string>
+    <string name="wa_1440_women_master_70">WA 1440 Master 70+ Feminino</string>
+    <string name="wa_1440_women_senior">WA 1440 Sênior Feminino</string>
+    <string name="half_wa_1440_cadet_men">Meio WA 1440 Cadete Masculino</string>
+    <string name="half_wa_1440_cadet_women">Meio WA 1440 Cadete Feminino</string>
+    <string name="half_wa_1440_junior_men">Meio WA 1440 Júnior Masculino</string>
+    <string name="half_wa_1440_junior_women">Meio WA 1440 Júnior Feminino</string>
+    <string name="half_wa_1440_men_master_50">Meio WA 1440 Master 50+ Masculino</string>
+    <string name="half_wa_1440_men_master_60">Meio WA 1440 Master 60+ Masculino</string>
+    <string name="half_wa_1440_men_master_70">Meio WA 1440 Master 70+ Masculino</string>
+    <string name="half_wa_1440_men_senior">Meio WA 1440 Sênior Masculino</string>
+    <string name="half_wa_1440_women_master_50">Meio WA 1440 Master 50+ Feminino</string>
+    <string name="half_wa_1440_women_master_60">Meio WA 1440 Master 60+ Feminino</string>
+    <string name="half_wa_1440_women_master_70">Meio WA 1440 Master 70+ Feminino</string>
+    <string name="half_wa_1440_women_senior">Meio WA 1440 Sênior Feminino</string>
+    <string name="wa_double_720_30_80cm">WA duplo 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA duplo 720 30m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA 720 duplo 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA duplo 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA 720 duplo 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA 720 duplo 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA 720 duplo 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Júnior National</string>
+    <string name="short_junior_warwick">Short Júnior Warwick</string>
+    <string name="short_junior_western">Short Júnior Western</string>
+    <string name="short_junior_windsor">Short Júnior Windsor</string>
+    <string name="junior_national">Júnior National</string>
+    <string name="junior_warwick">Júnior Warwick</string>
+    <string name="junior_western">Júnior Western</string>
+    <string name="junior_windsor">Júnior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Métrico I</string>
+    <string name="metric_ii">Métrico II</string>
+    <string name="metric_iii">Métrico III</string>
+    <string name="metric_iv">Métrico IV</string>
+    <string name="metric_v">Métrico V</string>
+    <string name="long_metric_i">Longo Métrico I</string>
+    <string name="long_metric_ii">Longo Métrico II</string>
+    <string name="long_metric_iii">Longo Métrico III</string>
+    <string name="long_metric_iv">Longo Métrico IV</string>
+    <string name="long_metric_v">Longo Métrico V</string>
+    <string name="long_metric_gents">Longo Métrico (Cavalheiros)</string>
+    <string name="long_metric_ladies">Longo Métrico (Damas)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediário</string>
+    <string name="junior_canberra">Canberra Júnior</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 clássico/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 clássico/Dakota: Infantil</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 clássico/Dakota: Júnior/Juvenil</string>
+    <string name="nfaa_600_cub">NFAA 600: Infantil</string>
+    <string name="nfaa_600_junior">NFAA 600: Júnior/juvenil</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Infantil</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Júnior/Juvenil</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Infantil</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Júnior/Juvenil</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-pt-rBR/strings.xml b/shared/src/main/res/values-pt-rBR/strings.xml
index 1c0bc5b0a..841a60406 100644
--- a/shared/src/main/res/values-pt-rBR/strings.xml
+++ b/shared/src/main/res/values-pt-rBR/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arco recurvo</string>
-  <string name="compound_bow">Arco Composto</string>
-  <string name="bare_bow">Instintivo</string>
-  <string name="long_bow">Long Bow</string>
-  <string name="horse_bow">Horse Bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Ensolarado</string>
-  <string name="partly_cloudy">Parcialmente Nublado</string>
-  <string name="cloudy">Nublado</string>
-  <string name="light_rain">Garoa</string>
-  <string name="rain">Chuvoso</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d flechas (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Pequeno</string>
-  <string name="medium">Médio</string>
-  <string name="large">Grande</string>
-  <string name="xlarge">Extra Grande</string>
-  <string name="unknown">Desconhecido</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Vento</string>
-  <string name="location">Local</string>
-  <string name="bft_0">0 Bft: Sem vento</string>
-  <string name="bft_1">1 Bft: Folhas sem movimento</string>
-  <string name="bft_2">2 Bft: Folhas se movendo</string>
-  <string name="bft_3">3 Bft: Bandeirolas se movendo</string>
-  <string name="bft_4">4 Bft: Ramos se movendo</string>
-  <string name="bft_5">5 Bft: Arbustos se movendo</string>
-  <string name="bft_6">6 Bft: Galhos grandes se movendo</string>
-  <string name="bft_7">7 Bft: Árvores balançando</string>
-  <string name="bft_8">8 Bft: Pequenos galhos quebrando</string>
-  <string name="bft_9">9 Bft: Tempestade</string>
-  <string name="front">frontal</string>
-  <string name="back">traseiro</string>
-  <string name="left">da esquerda</string>
-  <string name="right">da direita</string>
-  <string name="left_front">de noroeste</string>
-  <string name="right_front">de nordeste</string>
-  <string name="left_back">de sudoeste</string>
-  <string name="right_back">de sudeste</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Série %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d flecha</item>
-    <item quantity="other">%1$d \u00D7 %2$d flechas</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d flecha por série</item>
-    <item quantity="other">%d flechas por série</item>
-  </plurals>
+    <string name="recurve_bow">Arco recurvo</string>
+    <string name="compound_bow">Arco Composto</string>
+    <string name="bare_bow">Instintivo</string>
+    <string name="long_bow">Long Bow</string>
+    <string name="horse_bow">Horse Bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Ensolarado</string>
+    <string name="partly_cloudy">Parcialmente Nublado</string>
+    <string name="cloudy">Nublado</string>
+    <string name="light_rain">Garoa</string>
+    <string name="rain">Chuvoso</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d flechas (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Pequeno</string>
+    <string name="medium">Médio</string>
+    <string name="large">Grande</string>
+    <string name="xlarge">Extra Grande</string>
+    <string name="unknown">Desconhecido</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Vento</string>
+    <string name="location">Local</string>
+    <string name="bft_0">0 Bft: Sem vento</string>
+    <string name="bft_1">1 Bft: Folhas sem movimento</string>
+    <string name="bft_2">2 Bft: Folhas se movendo</string>
+    <string name="bft_3">3 Bft: Bandeirolas se movendo</string>
+    <string name="bft_4">4 Bft: Ramos se movendo</string>
+    <string name="bft_5">5 Bft: Arbustos se movendo</string>
+    <string name="bft_6">6 Bft: Galhos grandes se movendo</string>
+    <string name="bft_7">7 Bft: Árvores balançando</string>
+    <string name="bft_8">8 Bft: Pequenos galhos quebrando</string>
+    <string name="bft_9">9 Bft: Tempestade</string>
+    <string name="front">frontal</string>
+    <string name="back">traseiro</string>
+    <string name="left">da esquerda</string>
+    <string name="right">da direita</string>
+    <string name="left_front">de noroeste</string>
+    <string name="right_front">de nordeste</string>
+    <string name="left_back">de sudoeste</string>
+    <string name="right_back">de sudeste</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Série %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d flecha</item>
+        <item quantity="other">%1$d \u00D7 %2$d flechas</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d flecha por série</item>
+        <item quantity="other">%d flechas por série</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-pt-rBR/target_faces.xml b/shared/src/main/res/values-pt-rBR/target_faces.xml
index 055ec331b..1d4ca3953 100644
--- a/shared/src/main/res/values-pt-rBR/target_faces.xml
+++ b/shared/src/main/res/values-pt-rBR/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Normal</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA completo</string>
-  <string name="wa_6_ring">WA 6 Anéis</string>
-  <string name="wa_5_ring">WA 5 Anéis</string>
-  <string name="wa_3_ring">WA 3 Anéis</string>
-  <string name="vegas_3_spot">Vegas 3 Centros</string>
-  <string name="vertical_3_spot">WA 3 Centros Vertical</string>
-  <string name="wa_3_ring_3_spot">WA 3 Anéis 3 Centros</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Field Expert</string>
-  <string name="nfaa_hunter">NFAA Caçador</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Centros</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Acertar ou errar</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D DAIR</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Arco recurvo (X–1)</string>
-  <string name="recurve_style_10_1">Arco recurvo (10–1)</string>
-  <string name="recurve_style_x_5">Arco recurvo (X–5)</string>
-  <string name="recurve_style_10_5">Arco recurvo (10–5)</string>
-  <string name="recurve_style_x_6">Arco recurvo (X–6)</string>
-  <string name="recurve_style_10_6">Arco recurvo (10–6)</string>
-  <string name="recurve_style_x_8">Arco recurvo (X–8)</string>
-  <string name="recurve_style_10_8">Arco recurvo (10–8)</string>
-  <string name="compound_style">Arco composto</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Normal</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA completo</string>
+    <string name="wa_6_ring">WA 6 Anéis</string>
+    <string name="wa_5_ring">WA 5 Anéis</string>
+    <string name="wa_3_ring">WA 3 Anéis</string>
+    <string name="vegas_3_spot">Vegas 3 Centros</string>
+    <string name="vertical_3_spot">WA 3 Centros Vertical</string>
+    <string name="wa_3_ring_3_spot">WA 3 Anéis 3 Centros</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Field Expert</string>
+    <string name="nfaa_hunter">NFAA Caçador</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Centros</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Acertar ou errar</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D DAIR</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Arco recurvo (X–1)</string>
+    <string name="recurve_style_10_1">Arco recurvo (10–1)</string>
+    <string name="recurve_style_x_5">Arco recurvo (X–5)</string>
+    <string name="recurve_style_10_5">Arco recurvo (10–5)</string>
+    <string name="recurve_style_x_6">Arco recurvo (X–6)</string>
+    <string name="recurve_style_10_6">Arco recurvo (10–6)</string>
+    <string name="recurve_style_x_8">Arco recurvo (X–8)</string>
+    <string name="recurve_style_10_8">Arco recurvo (10–8)</string>
+    <string name="compound_style">Arco composto</string>
 </resources>
diff --git a/shared/src/main/res/values-pt-rPT/rounds.xml b/shared/src/main/res/values-pt-rPT/rounds.xml
index d03d74b46..a94dffcc1 100644
--- a/shared/src/main/res/values-pt-rPT/rounds.xml
+++ b/shared/src/main/res/values-pt-rPT/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
-  <string name="australian_indoor_1">Indoor Australiano 1</string>
-  <string name="australian_indoor_2">Indoor Australiano 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Alvos</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combinado</string>
-  <string name="match_round">Partida</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulto/Juvenil</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Infantil</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Infantil</string>
-  <string name="flint_bowman_indoor">Indoor Flint Bowman</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Eliminatória Composto Individual 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Eliminatória Composto Individual 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Eliminatória Composto Individual 50m</string>
-  <string name="wa_recurve_elimination_18">WA Eliminatória Recurvo 18m</string>
-  <string name="wa_recurve_elimination_50">WA Eliminatória Recurvo 50m</string>
-  <string name="wa_recurve_elimination_60">WA Eliminatória Recurvo 60m</string>
-  <string name="wa_recurve_elimination_70">WA Eliminatória Recurvo 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadete Feminino</string>
-  <string name="wa_compound_individual">WA Composto Individual</string>
-  <string name="wa_compound_qualification">WA Qualificação Composto</string>
-  <string name="wa_cub">WA Infantil</string>
-  <string name="wa_standard">WA Padrão</string>
-  <string name="olympic_round">Round Olímpico</string>
-  <string name="wa_1440_junior_men">WA 1440 Júnior Masculino</string>
-  <string name="wa_1440_junior_women">WA 1440 Júnior Feminino</string>
-  <string name="wa_1440_men_master_50">WA 1440 Master 50+ Masculino</string>
-  <string name="wa_1440_men_master_60">WA 1440 Master 60+ Masculino</string>
-  <string name="wa_1440_men_master_70">WA 1440 Master 70+ Masculino</string>
-  <string name="wa_1440_men_senior">WA 1440 Sênior Masculino</string>
-  <string name="wa_1440_women_master_50">WA 1440 Master 50+ Feminino</string>
-  <string name="wa_1440_women_master_60">WA 1440 Master 60+ Feminino</string>
-  <string name="wa_1440_women_master_70">WA 1440 Master 70+ Feminino</string>
-  <string name="wa_1440_women_senior">WA 1440 Sênior Feminino</string>
-  <string name="half_wa_1440_cadet_men">Meio WA 1440 Cadete Masculino</string>
-  <string name="half_wa_1440_cadet_women">Meio WA 1440 Cadete Feminino</string>
-  <string name="half_wa_1440_junior_men">Meio WA 1440 Júnior Masculino</string>
-  <string name="half_wa_1440_junior_women">Meio WA 1440 Júnior Feminino</string>
-  <string name="half_wa_1440_men_master_50">Meio WA 1440 Master 50+ Masculino</string>
-  <string name="half_wa_1440_men_master_60">Meio WA 1440 Master 60+ Masculino</string>
-  <string name="half_wa_1440_men_master_70">Meio WA 1440 Master 70+ Masculino</string>
-  <string name="half_wa_1440_men_senior">Meio WA 1440 Sênior Masculino</string>
-  <string name="half_wa_1440_women_master_50">Meio WA 1440 Master 50+ Feminino</string>
-  <string name="half_wa_1440_women_master_60">Meio WA 1440 Master 60+ Feminino</string>
-  <string name="half_wa_1440_women_master_70">Meio WA 1440 Master 70+ Feminino</string>
-  <string name="half_wa_1440_women_senior">Meio WA 1440 Sênior Feminino</string>
-  <string name="wa_double_720_30_80cm">WA duplo 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA duplo 720 30m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA 720 duplo 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA duplo 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA 720 duplo 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA 720 duplo 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA 720 duplo 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Júnior National</string>
-  <string name="short_junior_warwick">Short Júnior Warwick</string>
-  <string name="short_junior_western">Short Júnior Western</string>
-  <string name="short_junior_windsor">Short Júnior Windsor</string>
-  <string name="junior_national">Júnior National</string>
-  <string name="junior_warwick">Júnior Warwick</string>
-  <string name="junior_western">Júnior Western</string>
-  <string name="junior_windsor">Júnior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Métrico I</string>
-  <string name="metric_ii">Métrico II</string>
-  <string name="metric_iii">Métrico III</string>
-  <string name="metric_iv">Métrico IV</string>
-  <string name="metric_v">Métrico V</string>
-  <string name="long_metric_i">Longo Métrico I</string>
-  <string name="long_metric_ii">Longo Métrico II</string>
-  <string name="long_metric_iii">Longo Métrico III</string>
-  <string name="long_metric_iv">Longo Métrico IV</string>
-  <string name="long_metric_v">Longo Métrico V</string>
-  <string name="long_metric_gents">Longo Métrico (Cavalheiros)</string>
-  <string name="long_metric_ladies">Longo Métrico (Damas)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediário</string>
-  <string name="junior_canberra">Canberra Júnior</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 clássico/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 clássico/Dakota: Infantil</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 clássico/Dakota: Júnior/Juvenil</string>
-  <string name="nfaa_600_cub">NFAA 600: Infantil</string>
-  <string name="nfaa_600_junior">NFAA 600: Júnior/juvenil</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Infantil</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Júnior/Juvenil</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Infantil</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Júnior/Juvenil</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
+    <string name="australian_indoor_1">Indoor Australiano 1</string>
+    <string name="australian_indoor_2">Indoor Australiano 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Alvos</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combinado</string>
+    <string name="match_round">Partida</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulto/Juvenil</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Infantil</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Infantil</string>
+    <string name="flint_bowman_indoor">Indoor Flint Bowman</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Eliminatória Composto Individual 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Eliminatória Composto Individual 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Eliminatória Composto Individual 50m</string>
+    <string name="wa_recurve_elimination_18">WA Eliminatória Recurvo 18m</string>
+    <string name="wa_recurve_elimination_50">WA Eliminatória Recurvo 50m</string>
+    <string name="wa_recurve_elimination_60">WA Eliminatória Recurvo 60m</string>
+    <string name="wa_recurve_elimination_70">WA Eliminatória Recurvo 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadete Masculino</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadete Feminino</string>
+    <string name="wa_compound_individual">WA Composto Individual</string>
+    <string name="wa_compound_qualification">WA Qualificação Composto</string>
+    <string name="wa_cub">WA Infantil</string>
+    <string name="wa_standard">WA Padrão</string>
+    <string name="olympic_round">Round Olímpico</string>
+    <string name="wa_1440_junior_men">WA 1440 Júnior Masculino</string>
+    <string name="wa_1440_junior_women">WA 1440 Júnior Feminino</string>
+    <string name="wa_1440_men_master_50">WA 1440 Master 50+ Masculino</string>
+    <string name="wa_1440_men_master_60">WA 1440 Master 60+ Masculino</string>
+    <string name="wa_1440_men_master_70">WA 1440 Master 70+ Masculino</string>
+    <string name="wa_1440_men_senior">WA 1440 Sênior Masculino</string>
+    <string name="wa_1440_women_master_50">WA 1440 Master 50+ Feminino</string>
+    <string name="wa_1440_women_master_60">WA 1440 Master 60+ Feminino</string>
+    <string name="wa_1440_women_master_70">WA 1440 Master 70+ Feminino</string>
+    <string name="wa_1440_women_senior">WA 1440 Sênior Feminino</string>
+    <string name="half_wa_1440_cadet_men">Meio WA 1440 Cadete Masculino</string>
+    <string name="half_wa_1440_cadet_women">Meio WA 1440 Cadete Feminino</string>
+    <string name="half_wa_1440_junior_men">Meio WA 1440 Júnior Masculino</string>
+    <string name="half_wa_1440_junior_women">Meio WA 1440 Júnior Feminino</string>
+    <string name="half_wa_1440_men_master_50">Meio WA 1440 Master 50+ Masculino</string>
+    <string name="half_wa_1440_men_master_60">Meio WA 1440 Master 60+ Masculino</string>
+    <string name="half_wa_1440_men_master_70">Meio WA 1440 Master 70+ Masculino</string>
+    <string name="half_wa_1440_men_senior">Meio WA 1440 Sênior Masculino</string>
+    <string name="half_wa_1440_women_master_50">Meio WA 1440 Master 50+ Feminino</string>
+    <string name="half_wa_1440_women_master_60">Meio WA 1440 Master 60+ Feminino</string>
+    <string name="half_wa_1440_women_master_70">Meio WA 1440 Master 70+ Feminino</string>
+    <string name="half_wa_1440_women_senior">Meio WA 1440 Sênior Feminino</string>
+    <string name="wa_double_720_30_80cm">WA duplo 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA duplo 720 30m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA 720 duplo 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA duplo 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA 720 duplo 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA 720 duplo 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA 720 duplo 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Júnior National</string>
+    <string name="short_junior_warwick">Short Júnior Warwick</string>
+    <string name="short_junior_western">Short Júnior Western</string>
+    <string name="short_junior_windsor">Short Júnior Windsor</string>
+    <string name="junior_national">Júnior National</string>
+    <string name="junior_warwick">Júnior Warwick</string>
+    <string name="junior_western">Júnior Western</string>
+    <string name="junior_windsor">Júnior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Métrico I</string>
+    <string name="metric_ii">Métrico II</string>
+    <string name="metric_iii">Métrico III</string>
+    <string name="metric_iv">Métrico IV</string>
+    <string name="metric_v">Métrico V</string>
+    <string name="long_metric_i">Longo Métrico I</string>
+    <string name="long_metric_ii">Longo Métrico II</string>
+    <string name="long_metric_iii">Longo Métrico III</string>
+    <string name="long_metric_iv">Longo Métrico IV</string>
+    <string name="long_metric_v">Longo Métrico V</string>
+    <string name="long_metric_gents">Longo Métrico (Cavalheiros)</string>
+    <string name="long_metric_ladies">Longo Métrico (Damas)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediário</string>
+    <string name="junior_canberra">Canberra Júnior</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 clássico/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 clássico/Dakota: Infantil</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 clássico/Dakota: Júnior/Juvenil</string>
+    <string name="nfaa_600_cub">NFAA 600: Infantil</string>
+    <string name="nfaa_600_junior">NFAA 600: Júnior/juvenil</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Infantil</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Júnior/Juvenil</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Infantil</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Júnior/Juvenil</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-pt-rPT/strings.xml b/shared/src/main/res/values-pt-rPT/strings.xml
index 7b8c04ef1..a07db414a 100644
--- a/shared/src/main/res/values-pt-rPT/strings.xml
+++ b/shared/src/main/res/values-pt-rPT/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-pt-rPT/target_faces.xml b/shared/src/main/res/values-pt-rPT/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-pt-rPT/target_faces.xml
+++ b/shared/src/main/res/values-pt-rPT/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ro/rounds.xml b/shared/src/main/res/values-ro/rounds.xml
index d9a732c53..573f8c6f9 100644
--- a/shared/src/main/res/values-ro/rounds.xml
+++ b/shared/src/main/res/values-ro/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulti/Tineret</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Copii</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Copii</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadeti Masculin</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadeti Feminin</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Copii</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Masculin</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Feminin</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulti/Tineret</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Copii</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Copii</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadeti Masculin</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadeti Feminin</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Copii</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Masculin</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Feminin</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ro/strings.xml b/shared/src/main/res/values-ro/strings.xml
index 3580de812..62e2125e6 100644
--- a/shared/src/main/res/values-ro/strings.xml
+++ b/shared/src/main/res/values-ro/strings.xml
@@ -15,63 +15,63 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Arc Recurve</string>
-  <string name="compound_bow">Arc Compound</string>
-  <string name="bare_bow">Barebow</string>
-  <string name="long_bow">Longbow</string>
-  <string name="horse_bow">Horsebow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Insorit</string>
-  <string name="partly_cloudy">Parțial noros</string>
-  <string name="cloudy">Înnorat</string>
-  <string name="light_rain">Ploaie ușoară</string>
-  <string name="rain">Ploios</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d săgeţi (tinta %4$s)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Mică</string>
-  <string name="medium">Medie</string>
-  <string name="large">Mare</string>
-  <string name="xlarge">Foarte mare</string>
-  <string name="unknown">Necunoscută</string>
-  <string name="indoor">În interior</string>
-  <string name="wind">Vânt</string>
-  <string name="location">Locaţie</string>
-  <string name="bft_0">0 Bft: Fara vant</string>
-  <string name="bft_1">1 Bft: Frunzele nu se misca</string>
-  <string name="bft_2">2 Bft: Frunzele se mişcă</string>
-  <string name="bft_3">3 Bft: Steagurile usoare încep să se miste</string>
-  <string name="bft_4">4 Bft: Ramuri mici încep să se mişte</string>
-  <string name="bft_5">5 Bft: Copaci mici se mişcă</string>
-  <string name="bft_6">6 Bft: Ramuri mari se mişcă</string>
-  <string name="bft_7">5 Bft: Copaci mici se mişcă</string>
-  <string name="bft_8">8 Bft: Ramuri mici se rup</string>
-  <string name="bft_9">9 Bft: Furtuna</string>
-  <string name="front">din faţă</string>
-  <string name="back">din spate</string>
-  <string name="left">din stânga</string>
-  <string name="right">din dreapta</string>
-  <string name="left_front">din fata stanga</string>
-  <string name="right_front">din fata dreapta</string>
-  <string name="left_back">din spate stânga</string>
-  <string name="right_back">din spate dreapta</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">Setul %d</string>
-  <string name="miss">Ratare</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Tragerea %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d runda</item>
-    <item quantity="few">%d runde</item>
-    <item quantity="other">%d runde</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d sageata</item>
-    <item quantity="few">%1$d \u00D7 %2$d sageti</item>
-    <item quantity="other">%1$d \u00D7 %2$d sageti</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d sageata / set</item>
-    <item quantity="few">%d sageti / set</item>
-    <item quantity="other">%d sageti / set</item>
-  </plurals>
+    <string name="recurve_bow">Arc Recurve</string>
+    <string name="compound_bow">Arc Compound</string>
+    <string name="bare_bow">Barebow</string>
+    <string name="long_bow">Longbow</string>
+    <string name="horse_bow">Horsebow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Insorit</string>
+    <string name="partly_cloudy">Parțial noros</string>
+    <string name="cloudy">Înnorat</string>
+    <string name="light_rain">Ploaie ușoară</string>
+    <string name="rain">Ploios</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d săgeţi (tinta %4$s)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Mică</string>
+    <string name="medium">Medie</string>
+    <string name="large">Mare</string>
+    <string name="xlarge">Foarte mare</string>
+    <string name="unknown">Necunoscută</string>
+    <string name="indoor">În interior</string>
+    <string name="wind">Vânt</string>
+    <string name="location">Locaţie</string>
+    <string name="bft_0">0 Bft: Fara vant</string>
+    <string name="bft_1">1 Bft: Frunzele nu se misca</string>
+    <string name="bft_2">2 Bft: Frunzele se mişcă</string>
+    <string name="bft_3">3 Bft: Steagurile usoare încep să se miste</string>
+    <string name="bft_4">4 Bft: Ramuri mici încep să se mişte</string>
+    <string name="bft_5">5 Bft: Copaci mici se mişcă</string>
+    <string name="bft_6">6 Bft: Ramuri mari se mişcă</string>
+    <string name="bft_7">5 Bft: Copaci mici se mişcă</string>
+    <string name="bft_8">8 Bft: Ramuri mici se rup</string>
+    <string name="bft_9">9 Bft: Furtuna</string>
+    <string name="front">din faţă</string>
+    <string name="back">din spate</string>
+    <string name="left">din stânga</string>
+    <string name="right">din dreapta</string>
+    <string name="left_front">din fata stanga</string>
+    <string name="right_front">din fata dreapta</string>
+    <string name="left_back">din spate stânga</string>
+    <string name="right_back">din spate dreapta</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">Setul %d</string>
+    <string name="miss">Ratare</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Tragerea %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d runda</item>
+        <item quantity="few">%d runde</item>
+        <item quantity="other">%d runde</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d sageata</item>
+        <item quantity="few">%1$d \u00D7 %2$d sageti</item>
+        <item quantity="other">%1$d \u00D7 %2$d sageti</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d sageata / set</item>
+        <item quantity="few">%d sageti / set</item>
+        <item quantity="other">%d sageti / set</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ro/target_faces.xml b/shared/src/main/res/values-ro/target_faces.xml
index bf8fe315d..08f270e79 100644
--- a/shared/src/main/res/values-ro/target_faces.xml
+++ b/shared/src/main/res/values-ro/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Normală</string>
-  <string name="target_type_field_archery">Teren</string>
-  <string name="target_type_3d_archery">3D animale</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Field Expert</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Normală</string>
+    <string name="target_type_field_archery">Teren</string>
+    <string name="target_type_3d_archery">3D animale</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Field Expert</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-ru/rounds.xml b/shared/src/main/res/values-ru/rounds.xml
index f8fce640d..2fe99fadc 100644
--- a/shared/src/main/res/values-ru/rounds.xml
+++ b/shared/src/main/res/values-ru/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Австралийский комбинированный для крытых помещений</string>
-  <string name="australian_indoor_1">Австралийский крытый 1</string>
-  <string name="australian_indoor_2">Австралийский крытый 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40 см)</string>
-  <string name="wa_18_60cm">WA 18 (60 см)</string>
-  <string name="wa_3_spot">WA 3-х</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA смешанный</string>
-  <string name="match_round">Матч раунд</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Крытый: Взрослый/молодежь</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Крытый: дети</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: дети</string>
-  <string name="flint_bowman_indoor">Flint Bowman для крытых помещений</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18 m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40 m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50 m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18 m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50 m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60 m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70 m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 кадеты мужчины</string>
-  <string name="wa_1440_cadet_women">WA 1440 кадеты женщины</string>
-  <string name="wa_compound_individual">WA Compound индивидуальный</string>
-  <string name="wa_compound_qualification">WA Compound квалификация</string>
-  <string name="wa_cub">WA дети</string>
-  <string name="wa_standard">WA стандарт</string>
-  <string name="olympic_round">Олимпийский тур</string>
-  <string name="wa_1440_junior_men">WA 1440 Юниоры Мужчины</string>
-  <string name="wa_1440_junior_women">WA 1440 Юниоры Женщины</string>
-  <string name="wa_1440_men_master_50">WA 1440 Мужчины Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Мужчины Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Мужчины Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Мужчины взрослые</string>
-  <string name="wa_1440_women_master_50">WA 1440 Женщины Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Женщины Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Женщины Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Женщины</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Кадеты Мужчины</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Кадеты Женщины</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Юниоры Мужчины</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Юниоры Женщины</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Мужчины Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Мужчины Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Мужчины Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Мужчины</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Женщины Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Женщины Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Женщины Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Женщины</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Мужчины)</string>
-  <string name="long_metric_ladies">Long Metric (Женщины)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Canberra юниор</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: дети</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: юниоры</string>
-  <string name="nfaa_600_cub">NFAA 600: дети</string>
-  <string name="nfaa_600_junior">NFAA 600: юниоры</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: дети</string>
-  <string name="nfaa_810_junior">NFAA/American 810: юниоры</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: дети</string>
-  <string name="nfaa_900_junior">NFAA/American 900: юниоры</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Австралийский комбинированный для крытых помещений</string>
+    <string name="australian_indoor_1">Австралийский крытый 1</string>
+    <string name="australian_indoor_2">Австралийский крытый 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40 см)</string>
+    <string name="wa_18_60cm">WA 18 (60 см)</string>
+    <string name="wa_3_spot">WA 3-х</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA смешанный</string>
+    <string name="match_round">Матч раунд</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Крытый: Взрослый/молодежь</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Крытый: дети</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: дети</string>
+    <string name="flint_bowman_indoor">Flint Bowman для крытых помещений</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18 m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40 m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50 m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18 m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50 m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60 m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70 m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 кадеты мужчины</string>
+    <string name="wa_1440_cadet_women">WA 1440 кадеты женщины</string>
+    <string name="wa_compound_individual">WA Compound индивидуальный</string>
+    <string name="wa_compound_qualification">WA Compound квалификация</string>
+    <string name="wa_cub">WA дети</string>
+    <string name="wa_standard">WA стандарт</string>
+    <string name="olympic_round">Олимпийский тур</string>
+    <string name="wa_1440_junior_men">WA 1440 Юниоры Мужчины</string>
+    <string name="wa_1440_junior_women">WA 1440 Юниоры Женщины</string>
+    <string name="wa_1440_men_master_50">WA 1440 Мужчины Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Мужчины Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Мужчины Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Мужчины взрослые</string>
+    <string name="wa_1440_women_master_50">WA 1440 Женщины Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Женщины Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Женщины Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Женщины</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Кадеты Мужчины</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Кадеты Женщины</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Юниоры Мужчины</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Юниоры Женщины</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Мужчины Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Мужчины Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Мужчины Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Мужчины</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Женщины Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Женщины Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Женщины Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Женщины</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Мужчины)</string>
+    <string name="long_metric_ladies">Long Metric (Женщины)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Canberra юниор</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: дети</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: юниоры</string>
+    <string name="nfaa_600_cub">NFAA 600: дети</string>
+    <string name="nfaa_600_junior">NFAA 600: юниоры</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: дети</string>
+    <string name="nfaa_810_junior">NFAA/American 810: юниоры</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: дети</string>
+    <string name="nfaa_900_junior">NFAA/American 900: юниоры</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-ru/strings.xml b/shared/src/main/res/values-ru/strings.xml
index 417262fc1..044b79b75 100644
--- a/shared/src/main/res/values-ru/strings.xml
+++ b/shared/src/main/res/values-ru/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Спортивный классический лук</string>
-  <string name="compound_bow">Блочный лук</string>
-  <string name="bare_bow">Классический лук без обвесов</string>
-  <string name="long_bow">Длинный английский лук</string>
-  <string name="horse_bow">Короткий традиционный лук</string>
-  <string name="yumi">Азиатский традиционный лук</string>
-  <string name="sunny">Солнечно</string>
-  <string name="partly_cloudy">Переменная облачность</string>
-  <string name="cloudy">Пасмурно</string>
-  <string name="light_rain">Небольшой дождь</string>
-  <string name="rain">Дождливо</string>
-  <string name="round_desc">%1$s: %2$d × %3$d стрелы (%4$s)</string>
-  <string name="mini">Мини</string>
-  <string name="small">Маленький</string>
-  <string name="medium">Средний</string>
-  <string name="large">Большой</string>
-  <string name="xlarge">Очень большой</string>
-  <string name="unknown">Неизвестно</string>
-  <string name="indoor">В помещении</string>
-  <string name="wind">Ветер</string>
-  <string name="location">Расположение</string>
-  <string name="bft_0">0 Bft: безветренно</string>
-  <string name="bft_1">1 Bft: листья не двигаются</string>
-  <string name="bft_2">2 Bft: листья начинают двигаться</string>
-  <string name="bft_3">3 Bft: легкие флаги начинают двигаться</string>
-  <string name="bft_4">4 Bft: мелкие ветви начинают двигаться</string>
-  <string name="bft_5">5 Bft: небольшие деревья качаются</string>
-  <string name="bft_6">6 Bft: большие ветки раскачиваются</string>
-  <string name="bft_7">7 Bft: деревья раскачиваются целиком</string>
-  <string name="bft_8">8 Bft: мелкие кусты ломаются</string>
-  <string name="bft_9">9 Bft: штормовые повреждения</string>
-  <string name="front">с фронта</string>
-  <string name="back">сзади</string>
-  <string name="left">слева</string>
-  <string name="right">справа</string>
-  <string name="left_front">с фронта слева</string>
-  <string name="right_front">с фронта справа</string>
-  <string name="left_back">сзади слева</string>
-  <string name="right_back">сзади справа</string>
-  <string name="stop">СТОП</string>
-  <string name="end_n">Серия %d</string>
-  <string name="miss">Промах</string>
-  <string name="backspace">Возврат</string>
-  <string name="accessibility_description_shot_n_score">Выстрел %1$d из %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="few">%d rounds</item>
-    <item quantity="many">%d раундов</item>
-    <item quantity="other">%d раундов</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="few">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d стрелы</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">осталась %d стрела</item>
-    <item quantity="few">осталось %d стрелы</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">осталось %d стрелы</item>
-  </plurals>
+    <string name="recurve_bow">Спортивный классический лук</string>
+    <string name="compound_bow">Блочный лук</string>
+    <string name="bare_bow">Классический лук без обвесов</string>
+    <string name="long_bow">Длинный английский лук</string>
+    <string name="horse_bow">Короткий традиционный лук</string>
+    <string name="yumi">Азиатский традиционный лук</string>
+    <string name="sunny">Солнечно</string>
+    <string name="partly_cloudy">Переменная облачность</string>
+    <string name="cloudy">Пасмурно</string>
+    <string name="light_rain">Небольшой дождь</string>
+    <string name="rain">Дождливо</string>
+    <string name="round_desc">%1$s: %2$d × %3$d стрелы (%4$s)</string>
+    <string name="mini">Мини</string>
+    <string name="small">Маленький</string>
+    <string name="medium">Средний</string>
+    <string name="large">Большой</string>
+    <string name="xlarge">Очень большой</string>
+    <string name="unknown">Неизвестно</string>
+    <string name="indoor">В помещении</string>
+    <string name="wind">Ветер</string>
+    <string name="location">Расположение</string>
+    <string name="bft_0">0 Bft: безветренно</string>
+    <string name="bft_1">1 Bft: листья не двигаются</string>
+    <string name="bft_2">2 Bft: листья начинают двигаться</string>
+    <string name="bft_3">3 Bft: легкие флаги начинают двигаться</string>
+    <string name="bft_4">4 Bft: мелкие ветви начинают двигаться</string>
+    <string name="bft_5">5 Bft: небольшие деревья качаются</string>
+    <string name="bft_6">6 Bft: большие ветки раскачиваются</string>
+    <string name="bft_7">7 Bft: деревья раскачиваются целиком</string>
+    <string name="bft_8">8 Bft: мелкие кусты ломаются</string>
+    <string name="bft_9">9 Bft: штормовые повреждения</string>
+    <string name="front">с фронта</string>
+    <string name="back">сзади</string>
+    <string name="left">слева</string>
+    <string name="right">справа</string>
+    <string name="left_front">с фронта слева</string>
+    <string name="right_front">с фронта справа</string>
+    <string name="left_back">сзади слева</string>
+    <string name="right_back">сзади справа</string>
+    <string name="stop">СТОП</string>
+    <string name="end_n">Серия %d</string>
+    <string name="miss">Промах</string>
+    <string name="backspace">Возврат</string>
+    <string name="accessibility_description_shot_n_score">Выстрел %1$d из %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="few">%d rounds</item>
+        <item quantity="many">%d раундов</item>
+        <item quantity="other">%d раунда</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="few">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d стрелы</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">осталась %d стрела</item>
+        <item quantity="few">осталось %d стрелы</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">осталось %d стрелы</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-ru/target_faces.xml b/shared/src/main/res/values-ru/target_faces.xml
index 241c72d67..d0f117399 100644
--- a/shared/src/main/res/values-ru/target_faces.xml
+++ b/shared/src/main/res/values-ru/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Стандартный</string>
-  <string name="target_type_field_archery">Область</string>
-  <string name="target_type_3d_archery">ЗD мишень</string>
-  <!-- Target names -->
-  <string name="wa_full">WA полный</string>
-  <string name="wa_6_ring">WA 6 колец</string>
-  <string name="wa_5_ring">WA 5 колец</string>
-  <string name="wa_3_ring">WA 3 кольца</string>
-  <string name="vegas_3_spot">Vegas 3-х</string>
-  <string name="vertical_3_spot">WA вертикальный 3-х</string>
-  <string name="wa_3_ring_3_spot">WA 3 кольца 3-х</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5-х</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">\"Пан или пропал\"</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAA Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA период</string>
-  <string name="wa_field_3_spot">WA двухцветный 3-х</string>
-  <string name="wa_danage_3_spot">WA учет попаданий 3-х</string>
-  <string name="wa_danage_6_spot">WA учет попаданий 6-х</string>
-  <string name="dbsc_blowpipe">DBSC (3 кольца, значения 3,5,7)</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS цветной (обратные значения 10-1)</string>
-  <string name="recurve_style_x_1">Классический стиль (Х-1)</string>
-  <string name="recurve_style_10_1">Классический стиль (10-1)</string>
-  <string name="recurve_style_x_5">Классический стиль (Х-5)</string>
-  <string name="recurve_style_10_5">Классический стиль (10-5)</string>
-  <string name="recurve_style_x_6">Классический стиль (Х-6)</string>
-  <string name="recurve_style_10_6">Классический стиль (10-6)</string>
-  <string name="recurve_style_x_8">Классический стиль (Х-8)</string>
-  <string name="recurve_style_10_8">Классический стиль (10-8)</string>
-  <string name="compound_style">Стиль блочного лука</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Стандартный</string>
+    <string name="target_type_field_archery">Область</string>
+    <string name="target_type_3d_archery">ЗD мишень</string>
+    <!-- Target names -->
+    <string name="wa_full">WA полный</string>
+    <string name="wa_6_ring">WA 6 колец</string>
+    <string name="wa_5_ring">WA 5 колец</string>
+    <string name="wa_3_ring">WA 3 кольца</string>
+    <string name="vegas_3_spot">Vegas 3-х</string>
+    <string name="vertical_3_spot">WA вертикальный 3-х</string>
+    <string name="wa_3_ring_3_spot">WA 3 кольца 3-х</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5-х</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">\"Пан или пропал\"</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAA Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA период</string>
+    <string name="wa_field_3_spot">WA двухцветный 3-х</string>
+    <string name="wa_danage_3_spot">WA учет попаданий 3-х</string>
+    <string name="wa_danage_6_spot">WA учет попаданий 6-х</string>
+    <string name="dbsc_blowpipe">DBSC (3 кольца, значения 3,5,7)</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS цветной (обратные значения 10-1)</string>
+    <string name="recurve_style_x_1">Классический стиль (Х-1)</string>
+    <string name="recurve_style_10_1">Классический стиль (10-1)</string>
+    <string name="recurve_style_x_5">Классический стиль (Х-5)</string>
+    <string name="recurve_style_10_5">Классический стиль (10-5)</string>
+    <string name="recurve_style_x_6">Классический стиль (Х-6)</string>
+    <string name="recurve_style_10_6">Классический стиль (10-6)</string>
+    <string name="recurve_style_x_8">Классический стиль (Х-8)</string>
+    <string name="recurve_style_10_8">Классический стиль (10-8)</string>
+    <string name="compound_style">Стиль блочного лука</string>
 </resources>
diff --git a/shared/src/main/res/values-sk/rounds.xml b/shared/src/main/res/values-sk/rounds.xml
index 19eb39591..a1ee09386 100644
--- a/shared/src/main/res/values-sk/rounds.xml
+++ b/shared/src/main/res/values-sk/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">18 WA (60cm)</string>
-  <string name="wa_3_spot">WA 3 spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA kombinované</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Hala: Dospelý/Mládež</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Hala: Chrobáci</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Chrobáci</string>
-  <string name="flint_bowman_indoor">Flint Bowman hala</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA individuálne eliminácie kladkové luky 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA individuálne eliminácie kladkové luky 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA individuálne eliminácie kladkové luky 50m</string>
-  <string name="wa_recurve_elimination_18">WA eliminácie olimpíjske luky 18m</string>
-  <string name="wa_recurve_elimination_50">WA eliminácie olimpíjske luky 50m</string>
-  <string name="wa_recurve_elimination_60">WA eliminácie olimpíjske luky 60m</string>
-  <string name="wa_recurve_elimination_70">WA eliminácie olimpíjske luky 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 kadeti muži</string>
-  <string name="wa_1440_cadet_women">WA 1440 kadeti ženy</string>
-  <string name="wa_compound_individual">WA individuálne kladkové luky</string>
-  <string name="wa_compound_qualification">WA kvalifikácia kladkové luky</string>
-  <string name="wa_cub">WA Chrobáci</string>
-  <string name="wa_standard">WA štandard</string>
-  <string name="olympic_round">Olympijské kolo</string>
-  <string name="wa_1440_junior_men">WA 1440 Juniori muži</string>
-  <string name="wa_1440_junior_women">WA 1440 Juniorky ženy</string>
-  <string name="wa_1440_men_master_50">WA 1440 borci muži 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 borci muži 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 borci muži 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 seniori muži</string>
-  <string name="wa_1440_women_master_50">WA 1440 borci ženy 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 borci ženy 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 borci ženy 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">18 WA (60cm)</string>
+    <string name="wa_3_spot">WA 3 spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA kombinované</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Hala: Dospelý/Mládež</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Hala: Chrobáci</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Chrobáci</string>
+    <string name="flint_bowman_indoor">Flint Bowman hala</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA individuálne eliminácie kladkové luky 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA individuálne eliminácie kladkové luky 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA individuálne eliminácie kladkové luky 50m</string>
+    <string name="wa_recurve_elimination_18">WA eliminácie olimpíjske luky 18m</string>
+    <string name="wa_recurve_elimination_50">WA eliminácie olimpíjske luky 50m</string>
+    <string name="wa_recurve_elimination_60">WA eliminácie olimpíjske luky 60m</string>
+    <string name="wa_recurve_elimination_70">WA eliminácie olimpíjske luky 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 kadeti muži</string>
+    <string name="wa_1440_cadet_women">WA 1440 kadeti ženy</string>
+    <string name="wa_compound_individual">WA individuálne kladkové luky</string>
+    <string name="wa_compound_qualification">WA kvalifikácia kladkové luky</string>
+    <string name="wa_cub">WA Chrobáci</string>
+    <string name="wa_standard">WA štandard</string>
+    <string name="olympic_round">Olympijské kolo</string>
+    <string name="wa_1440_junior_men">WA 1440 Juniori muži</string>
+    <string name="wa_1440_junior_women">WA 1440 Juniorky ženy</string>
+    <string name="wa_1440_men_master_50">WA 1440 borci muži 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 borci muži 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 borci muži 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 seniori muži</string>
+    <string name="wa_1440_women_master_50">WA 1440 borci ženy 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 borci ženy 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 borci ženy 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-sk/strings.xml b/shared/src/main/res/values-sk/strings.xml
index 69fb5d4f8..d9aaab68a 100644
--- a/shared/src/main/res/values-sk/strings.xml
+++ b/shared/src/main/res/values-sk/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Zvratný luk</string>
-  <string name="compound_bow">Kladkový luk</string>
-  <string name="bare_bow">Holý luk</string>
-  <string name="long_bow">Dlhý luk</string>
-  <string name="horse_bow">Jazdecký luk</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Slnečno</string>
-  <string name="partly_cloudy">Čiastočne zamračené</string>
-  <string name="cloudy">Zamračené</string>
-  <string name="light_rain">Slabý dážď</string>
-  <string name="rain">Daždivo</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d šípy (%4$s terč)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Malá</string>
-  <string name="medium">Stredná</string>
-  <string name="large">Veľká</string>
-  <string name="xlarge">Exra veľká</string>
-  <string name="unknown">Neznáma</string>
-  <string name="indoor">Hala</string>
-  <string name="wind">Vietor</string>
-  <string name="location">Pozícia</string>
-  <string name="bft_0">0 Bft: Bezvetrie</string>
-  <string name="bft_1">1 Bft: Listy sa nehýbu</string>
-  <string name="bft_2">2 Bft: Listy sa začínajú pohybovať</string>
-  <string name="bft_3">3 Bft: Ľahké vlajky sa začínajú pohybovať</string>
-  <string name="bft_4">4 Bft: Malé vetvy sa začínajú knísať</string>
-  <string name="bft_5">5 Bft: Malé stromy sa kníšu</string>
-  <string name="bft_6">6 Bft: Veľké konáre sa hýbu</string>
-  <string name="bft_7">7 Bft: Celé stromy sa kníšu</string>
-  <string name="bft_8">8 Bft: Malé konáre sa lámu</string>
-  <string name="bft_9">9 Bft: Ničivá búrka</string>
-  <string name="front">spredu</string>
-  <string name="back">zozadu</string>
-  <string name="left">zľava</string>
-  <string name="right">sprava</string>
-  <string name="left_front">spredu z ľava</string>
-  <string name="right_front">spredu z prava</string>
-  <string name="left_back">zozadu z ľava</string>
-  <string name="right_back">zozadu z prava</string>
-  <string name="stop">Zastaviť</string>
-  <string name="end_n">Sada %d</string>
-  <string name="miss">Minutie</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Strela %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d kolo</item>
-    <item quantity="few">%d kôl</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d kôl</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d šíp</item>
-    <item quantity="few">%1$d \u00D7 %2$d šípov</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d šípov</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d šíp za sadu</item>
-    <item quantity="few">%d šípov za sadu</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d šípov za sadu</item>
-  </plurals>
+    <string name="recurve_bow">Zvratný luk</string>
+    <string name="compound_bow">Kladkový luk</string>
+    <string name="bare_bow">Holý luk</string>
+    <string name="long_bow">Dlhý luk</string>
+    <string name="horse_bow">Jazdecký luk</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Slnečno</string>
+    <string name="partly_cloudy">Čiastočne zamračené</string>
+    <string name="cloudy">Zamračené</string>
+    <string name="light_rain">Slabý dážď</string>
+    <string name="rain">Daždivo</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d šípy (%4$s terč)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Malá</string>
+    <string name="medium">Stredná</string>
+    <string name="large">Veľká</string>
+    <string name="xlarge">Exra veľká</string>
+    <string name="unknown">Neznáma</string>
+    <string name="indoor">Hala</string>
+    <string name="wind">Vietor</string>
+    <string name="location">Pozícia</string>
+    <string name="bft_0">0 Bft: Bezvetrie</string>
+    <string name="bft_1">1 Bft: Listy sa nehýbu</string>
+    <string name="bft_2">2 Bft: Listy sa začínajú pohybovať</string>
+    <string name="bft_3">3 Bft: Ľahké vlajky sa začínajú pohybovať</string>
+    <string name="bft_4">4 Bft: Malé vetvy sa začínajú knísať</string>
+    <string name="bft_5">5 Bft: Malé stromy sa kníšu</string>
+    <string name="bft_6">6 Bft: Veľké konáre sa hýbu</string>
+    <string name="bft_7">7 Bft: Celé stromy sa kníšu</string>
+    <string name="bft_8">8 Bft: Malé konáre sa lámu</string>
+    <string name="bft_9">9 Bft: Ničivá búrka</string>
+    <string name="front">spredu</string>
+    <string name="back">zozadu</string>
+    <string name="left">zľava</string>
+    <string name="right">sprava</string>
+    <string name="left_front">spredu z ľava</string>
+    <string name="right_front">spredu z prava</string>
+    <string name="left_back">zozadu z ľava</string>
+    <string name="right_back">zozadu z prava</string>
+    <string name="stop">Zastaviť</string>
+    <string name="end_n">Sada %d</string>
+    <string name="miss">Minutie</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Strela %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d kolo</item>
+        <item quantity="few">%d kôl</item>
+        <item quantity="many">%d rounds</item>
+        <item quantity="other">%d kôl</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d šíp</item>
+        <item quantity="few">%1$d \u00D7 %2$d šípov</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d šípov</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d šíp za sadu</item>
+        <item quantity="few">%d šípov za sadu</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">%d šípov za sadu</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-sk/target_faces.xml b/shared/src/main/res/values-sk/target_faces.xml
index 5f9df4a1e..819fd15ac 100644
--- a/shared/src/main/res/values-sk/target_faces.xml
+++ b/shared/src/main/res/values-sk/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Štandardné</string>
-  <string name="target_type_field_archery">Terénne</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA úplný</string>
-  <string name="wa_6_ring">WA 6 kruh</string>
-  <string name="wa_5_ring">WA 5 kruh</string>
-  <string name="wa_3_ring">WA 3 kruh</string>
-  <string name="vegas_3_spot">Vegas 3 terč</string>
-  <string name="vertical_3_spot">WA vertikálny 3 terč</string>
-  <string name="wa_3_ring_3_spot">WA 3 kruh 3 terč</string>
-  <string name="nfaa_field">NFAA terénny</string>
-  <string name="nfaa_expert_field">NFAA terénny Expert</string>
-  <string name="nfaa_hunter">NFAA lovec</string>
-  <string name="nfaa_indoor">NFAA halový</string>
-  <string name="nfaa_indoor_5_spot">NFAA halový 5 terč</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA terénny</string>
-  <string name="hit_or_miss">Traf alebo miň</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA zvieratá</string>
-  <string name="nfaa_animal">NFAA zvieratá</string>
-  <string name="nfas_field">NFAS terénny</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA bodka</string>
-  <string name="wa_field_3_spot">WA terénny 3 terč</string>
-  <string name="wa_danage_3_spot">WA Danage 3 terč</string>
-  <string name="wa_danage_6_spot">WA Danage 6 terč</string>
-  <string name="dbsc_blowpipe">DBSC pre Fúkaciu tyč</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS farebný (opačný 10–1)</string>
-  <string name="recurve_style_x_1">Reflexný štýl (X-1)</string>
-  <string name="recurve_style_10_1">Reflexný štýl (10–1)</string>
-  <string name="recurve_style_x_5">Reflexný štýl (X–5)</string>
-  <string name="recurve_style_10_5">Reflexný štýl (10–5)</string>
-  <string name="recurve_style_x_6">Reflexný štýl (X-6)</string>
-  <string name="recurve_style_10_6">Reflexný štýl (10–6)</string>
-  <string name="recurve_style_x_8">Reflexný štýl (X-8)</string>
-  <string name="recurve_style_10_8">Reflexný štýl (10–8)</string>
-  <string name="compound_style">Kladkový štýl</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Štandardné</string>
+    <string name="target_type_field_archery">Terénne</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA úplný</string>
+    <string name="wa_6_ring">WA 6 kruh</string>
+    <string name="wa_5_ring">WA 5 kruh</string>
+    <string name="wa_3_ring">WA 3 kruh</string>
+    <string name="vegas_3_spot">Vegas 3 terč</string>
+    <string name="vertical_3_spot">WA vertikálny 3 terč</string>
+    <string name="wa_3_ring_3_spot">WA 3 kruh 3 terč</string>
+    <string name="nfaa_field">NFAA terénny</string>
+    <string name="nfaa_expert_field">NFAA terénny Expert</string>
+    <string name="nfaa_hunter">NFAA lovec</string>
+    <string name="nfaa_indoor">NFAA halový</string>
+    <string name="nfaa_indoor_5_spot">NFAA halový 5 terč</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA terénny</string>
+    <string name="hit_or_miss">Traf alebo miň</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA zvieratá</string>
+    <string name="nfaa_animal">NFAA zvieratá</string>
+    <string name="nfas_field">NFAS terénny</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA bodka</string>
+    <string name="wa_field_3_spot">WA terénny 3 terč</string>
+    <string name="wa_danage_3_spot">WA Danage 3 terč</string>
+    <string name="wa_danage_6_spot">WA Danage 6 terč</string>
+    <string name="dbsc_blowpipe">DBSC pre Fúkaciu tyč</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS farebný (opačný 10–1)</string>
+    <string name="recurve_style_x_1">Reflexný štýl (X-1)</string>
+    <string name="recurve_style_10_1">Reflexný štýl (10–1)</string>
+    <string name="recurve_style_x_5">Reflexný štýl (X–5)</string>
+    <string name="recurve_style_10_5">Reflexný štýl (10–5)</string>
+    <string name="recurve_style_x_6">Reflexný štýl (X-6)</string>
+    <string name="recurve_style_10_6">Reflexný štýl (10–6)</string>
+    <string name="recurve_style_x_8">Reflexný štýl (X-8)</string>
+    <string name="recurve_style_10_8">Reflexný štýl (10–8)</string>
+    <string name="compound_style">Kladkový štýl</string>
 </resources>
diff --git a/shared/src/main/res/values-sl/rounds.xml b/shared/src/main/res/values-sl/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-sl/rounds.xml
+++ b/shared/src/main/res/values-sl/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-sl/strings.xml b/shared/src/main/res/values-sl/strings.xml
index 1d85bb5ac..2f3dd3cca 100644
--- a/shared/src/main/res/values-sl/strings.xml
+++ b/shared/src/main/res/values-sl/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Ukrivljeni lok</string>
-  <string name="compound_bow">Sestavljeni lok</string>
-  <string name="bare_bow">Goli lok</string>
-  <string name="long_bow">Dolgi lok</string>
-  <string name="horse_bow">Mongolski lok</string>
-  <string name="yumi">Yumi (kyudo)</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="two">%d rounds</item>
-    <item quantity="few">%d rounds</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="two">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="few">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="two">%d arrows per end</item>
-    <item quantity="few">%d arrows per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Ukrivljeni lok</string>
+    <string name="compound_bow">Sestavljeni lok</string>
+    <string name="bare_bow">Goli lok</string>
+    <string name="long_bow">Dolgi lok</string>
+    <string name="horse_bow">Mongolski lok</string>
+    <string name="yumi">Yumi (kyudo)</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="two">%d rounds</item>
+        <item quantity="few">%d rounds</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="two">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="few">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="two">%d arrows per end</item>
+        <item quantity="few">%d arrows per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-sl/target_faces.xml b/shared/src/main/res/values-sl/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-sl/target_faces.xml
+++ b/shared/src/main/res/values-sl/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-sr/rounds.xml b/shared/src/main/res/values-sr/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-sr/rounds.xml
+++ b/shared/src/main/res/values-sr/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-sr/strings.xml b/shared/src/main/res/values-sr/strings.xml
index fe2f9e78c..ba7ddb256 100644
--- a/shared/src/main/res/values-sr/strings.xml
+++ b/shared/src/main/res/values-sr/strings.xml
@@ -15,63 +15,63 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="few">%d rounds</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="few">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="few">%d arrows per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="few">%d rounds</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="few">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="few">%d arrows per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-sr/target_faces.xml b/shared/src/main/res/values-sr/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-sr/target_faces.xml
+++ b/shared/src/main/res/values-sr/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-sv/rounds.xml b/shared/src/main/res/values-sv/rounds.xml
index bff6ce7fe..44ea94494 100644
--- a/shared/src/main/res/values-sv/rounds.xml
+++ b/shared/src/main/res/values-sv/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australiska Kombinerade Inomhus</string>
-  <string name="australian_indoor_1">Australiska inomhus 1</string>
-  <string name="australian_indoor_2">Australiska inomhus 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA kombinerad</string>
-  <string name="match_round">Match runda</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bary I</string>
-  <string name="bray_ii">Bray Ii</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 inomhus: vuxen/ungdom</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman inomhus</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individuell Compound Eliminering 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Inviduell Compound Eliminering 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individuell Compund Eliminering 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Herrar</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Damer</string>
-  <string name="wa_compound_individual">WA Compound individ</string>
-  <string name="wa_compound_qualification">WA Compound kvalifikation</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympisk runda</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Herrar Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Amerikansk</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Kort Junior Nationell</string>
-  <string name="short_junior_warwick">Kort Junior Warwick</string>
-  <string name="short_junior_western">Kort Junior Western</string>
-  <string name="short_junior_windsor">Kort Junior Windsor</string>
-  <string name="junior_national">Junior Nationell</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Kort National</string>
-  <string name="short_warwick">Kort Warwick</string>
-  <string name="short_western">Kort Western</string>
-  <string name="short_windsor">Kort Windsor</string>
-  <string name="national">Nationella</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Långa Nationella</string>
-  <string name="long_warwick">Lång Warwick</string>
-  <string name="long_western">Lång Western</string>
-  <string name="new_national">Nya Nationella</string>
-  <string name="new_warwick">Nya Warwick</string>
-  <string name="new_western">Nya Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metrisk V</string>
-  <string name="long_metric_i">Lång Metrisk I</string>
-  <string name="long_metric_ii">Lång Metrisk II</string>
-  <string name="long_metric_iii">Lång Metrisk III</string>
-  <string name="long_metric_iv">Lång Metrisk IV</string>
-  <string name="long_metric_v">Lång Metrisk V</string>
-  <string name="long_metric_gents">Lång metrisk (Herrar)</string>
-  <string name="long_metric_ladies">Lång metrisk (Damer)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Lång Brisbane</string>
-  <string name="long_sydney">Lång Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Kort Adelaide</string>
-  <string name="short_canberra">Kort Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Ungdom</string>
-  <string name="nfaa_810">NFAA/Amerikansk 810</string>
-  <string name="nfaa_810_cub">NFAA/Amerikansk 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/amerikansk 810: Junior/Ungdom</string>
-  <string name="nfaa_900">NFAA/Amerikansk 900</string>
-  <string name="nfaa_900_cub">NFAA/Amerikansk 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/Amerikansk 900: Junior/Ungdom</string>
-  <string name="canadian_900">Kanadensiska 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Djur 280</string>
-  <string name="ifaa_animal_300">IFAA Djur 300</string>
-  <string name="ifaa_animal_560">IFAA Djur 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Djur 280</string>
-  <string name="nfaa_animal_300">NFAA Djur 300</string>
-  <string name="nfaa_animal_588">NFAA Djur 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Fält 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Fält Bara 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Fält 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Fält 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Fält 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Jakt 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Jakt 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Jakt 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Fält/Jakt 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australiska Kombinerade Inomhus</string>
+    <string name="australian_indoor_1">Australiska inomhus 1</string>
+    <string name="australian_indoor_2">Australiska inomhus 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA kombinerad</string>
+    <string name="match_round">Match runda</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bary I</string>
+    <string name="bray_ii">Bray Ii</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 inomhus: vuxen/ungdom</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman inomhus</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individuell Compound Eliminering 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Inviduell Compound Eliminering 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individuell Compund Eliminering 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve eliminering 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve eliminering 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve eliminering 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve eliminering 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Herrar</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Damer</string>
+    <string name="wa_compound_individual">WA Compound individ</string>
+    <string name="wa_compound_qualification">WA Compound kvalifikation</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympisk runda</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Herrar Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Amerikansk</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Kort Junior Nationell</string>
+    <string name="short_junior_warwick">Kort Junior Warwick</string>
+    <string name="short_junior_western">Kort Junior Western</string>
+    <string name="short_junior_windsor">Kort Junior Windsor</string>
+    <string name="junior_national">Junior Nationell</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Kort National</string>
+    <string name="short_warwick">Kort Warwick</string>
+    <string name="short_western">Kort Western</string>
+    <string name="short_windsor">Kort Windsor</string>
+    <string name="national">Nationella</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Långa Nationella</string>
+    <string name="long_warwick">Lång Warwick</string>
+    <string name="long_western">Lång Western</string>
+    <string name="new_national">Nya Nationella</string>
+    <string name="new_warwick">Nya Warwick</string>
+    <string name="new_western">Nya Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metrisk V</string>
+    <string name="long_metric_i">Lång Metrisk I</string>
+    <string name="long_metric_ii">Lång Metrisk II</string>
+    <string name="long_metric_iii">Lång Metrisk III</string>
+    <string name="long_metric_iv">Lång Metrisk IV</string>
+    <string name="long_metric_v">Lång Metrisk V</string>
+    <string name="long_metric_gents">Lång metrisk (Herrar)</string>
+    <string name="long_metric_ladies">Lång metrisk (Damer)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Lång Brisbane</string>
+    <string name="long_sydney">Lång Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Kort Adelaide</string>
+    <string name="short_canberra">Kort Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Ungdom</string>
+    <string name="nfaa_810">NFAA/Amerikansk 810</string>
+    <string name="nfaa_810_cub">NFAA/Amerikansk 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/amerikansk 810: Junior/Ungdom</string>
+    <string name="nfaa_900">NFAA/Amerikansk 900</string>
+    <string name="nfaa_900_cub">NFAA/Amerikansk 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/Amerikansk 900: Junior/Ungdom</string>
+    <string name="canadian_900">Kanadensiska 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Djur 280</string>
+    <string name="ifaa_animal_300">IFAA Djur 300</string>
+    <string name="ifaa_animal_560">IFAA Djur 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Djur 280</string>
+    <string name="nfaa_animal_300">NFAA Djur 300</string>
+    <string name="nfaa_animal_588">NFAA Djur 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Fält 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Fält Bara 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Fält 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Fält 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Fält 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Jakt 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Jakt 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Jakt 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Fält/Jakt 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-sv/strings.xml b/shared/src/main/res/values-sv/strings.xml
index 5cd27a6d7..82f69a610 100644
--- a/shared/src/main/res/values-sv/strings.xml
+++ b/shared/src/main/res/values-sv/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurvebåge</string>
-  <string name="compound_bow">Compoundbåge</string>
-  <string name="bare_bow">Barebow</string>
-  <string name="long_bow">Långbåge</string>
-  <string name="horse_bow">Ryttarbåge</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Soligt</string>
-  <string name="partly_cloudy">Växlande molnighet</string>
-  <string name="cloudy">Molnigt</string>
-  <string name="light_rain">Lätt regn</string>
-  <string name="rain">Regnigt</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Liten</string>
-  <string name="medium">Medium</string>
-  <string name="large">Stor</string>
-  <string name="xlarge">Extra stor</string>
-  <string name="unknown">Okänd</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Vind</string>
-  <string name="location">Plats</string>
-  <string name="bft_0">0 Bft: vindstilla</string>
-  <string name="bft_1">1 Bft: Löven är stilla</string>
-  <string name="bft_2">2 Bft: Löven börjar röra på sig</string>
-  <string name="bft_3">3 Bft: Sträcker en vimpel</string>
-  <string name="bft_4">4 Bft: Sätter grenar i rörelse</string>
-  <string name="bft_5">5 Bft: Mindre lövträd börjar svaja</string>
-  <string name="bft_6">6 Bft: Sätter stora grenar i rörelse</string>
-  <string name="bft_7">7 Bft: Hela träd börjar svaja</string>
-  <string name="bft_8">8 Bft: Bryter kvistar</string>
-  <string name="bft_9">9 Bft: Bryter mindre träd, taktegel blåser ned</string>
-  <string name="front">framifrån</string>
-  <string name="back">bakifrån</string>
-  <string name="left">från vänster</string>
-  <string name="right">från höger</string>
-  <string name="left_front">från vänster fram</string>
-  <string name="right_front">från höger fram</string>
-  <string name="left_back">från vänster bak</string>
-  <string name="right_back">från höger bak</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurvebåge</string>
+    <string name="compound_bow">Compoundbåge</string>
+    <string name="bare_bow">Barebow</string>
+    <string name="long_bow">Långbåge</string>
+    <string name="horse_bow">Ryttarbåge</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Soligt</string>
+    <string name="partly_cloudy">Växlande molnighet</string>
+    <string name="cloudy">Molnigt</string>
+    <string name="light_rain">Lätt regn</string>
+    <string name="rain">Regnigt</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Liten</string>
+    <string name="medium">Medium</string>
+    <string name="large">Stor</string>
+    <string name="xlarge">Extra stor</string>
+    <string name="unknown">Okänd</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Vind</string>
+    <string name="location">Plats</string>
+    <string name="bft_0">0 Bft: vindstilla</string>
+    <string name="bft_1">1 Bft: Löven är stilla</string>
+    <string name="bft_2">2 Bft: Löven börjar röra på sig</string>
+    <string name="bft_3">3 Bft: Sträcker en vimpel</string>
+    <string name="bft_4">4 Bft: Sätter grenar i rörelse</string>
+    <string name="bft_5">5 Bft: Mindre lövträd börjar svaja</string>
+    <string name="bft_6">6 Bft: Sätter stora grenar i rörelse</string>
+    <string name="bft_7">7 Bft: Hela träd börjar svaja</string>
+    <string name="bft_8">8 Bft: Bryter kvistar</string>
+    <string name="bft_9">9 Bft: Bryter mindre träd, taktegel blåser ned</string>
+    <string name="front">framifrån</string>
+    <string name="back">bakifrån</string>
+    <string name="left">från vänster</string>
+    <string name="right">från höger</string>
+    <string name="left_front">från vänster fram</string>
+    <string name="right_front">från höger fram</string>
+    <string name="left_back">från vänster bak</string>
+    <string name="right_back">från höger bak</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-sv/target_faces.xml b/shared/src/main/res/values-sv/target_faces.xml
index 413905aaa..6f7f561be 100644
--- a/shared/src/main/res/values-sv/target_faces.xml
+++ b/shared/src/main/res/values-sv/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ringad</string>
-  <string name="wa_5_ring">WA 5 Ringad</string>
-  <string name="wa_3_ring">WA 3 Ringad</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ringad 3 Spot</string>
-  <string name="nfaa_field">NFAA Fält</string>
-  <string name="nfaa_expert_field">NFAA Expert Fält</string>
-  <string name="nfaa_hunter">NFAA Jakt</string>
-  <string name="nfaa_indoor">NFAA Inomhus</string>
-  <string name="nfaa_indoor_5_spot">NFAA Inomhus 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Fält</string>
-  <string name="hit_or_miss">Träff eller Miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Djur</string>
-  <string name="nfaa_animal">NFAA Djur</string>
-  <string name="nfas_field">NFAS Fält</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ringad</string>
+    <string name="wa_5_ring">WA 5 Ringad</string>
+    <string name="wa_3_ring">WA 3 Ringad</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ringad 3 Spot</string>
+    <string name="nfaa_field">NFAA Fält</string>
+    <string name="nfaa_expert_field">NFAA Expert Fält</string>
+    <string name="nfaa_hunter">NFAA Jakt</string>
+    <string name="nfaa_indoor">NFAA Inomhus</string>
+    <string name="nfaa_indoor_5_spot">NFAA Inomhus 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Fält</string>
+    <string name="hit_or_miss">Träff eller Miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Djur</string>
+    <string name="nfaa_animal">NFAA Djur</string>
+    <string name="nfas_field">NFAS Fält</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-tr/rounds.xml b/shared/src/main/res/values-tr/rounds.xml
index 4bc60df38..1cff53717 100644
--- a/shared/src/main/res/values-tr/rounds.xml
+++ b/shared/src/main/res/values-tr/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Avustralya kombine kapalı</string>
-  <string name="australian_indoor_1">Avustralya Salon 1</string>
-  <string name="australian_indoor_2">Avustralya Salon 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 nokta</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA kombine</string>
-  <string name="match_round">Maç turu</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 SAlon: Yetişkin/genç</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 SAlon: Kulüp</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: minik</string>
-  <string name="flint_bowman_indoor">Flint Bowman Salon</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA bireysel makaralı eleme 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA bireysel makaralı eleme 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA bireysel makaralı eleme 50m</string>
-  <string name="wa_recurve_elimination_18">WA olimpik eleme 18m</string>
-  <string name="wa_recurve_elimination_50">WA olimpik eleme 50m</string>
-  <string name="wa_recurve_elimination_60">WA olimpik eleme 60m</string>
-  <string name="wa_recurve_elimination_70">WA olimpik eleme 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet erkek</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet bayan</string>
-  <string name="wa_compound_individual">WA makaralı bireysel</string>
-  <string name="wa_compound_qualification">WA makaralı Eleme</string>
-  <string name="wa_cub">WA kulüp</string>
-  <string name="wa_standard">WA standart</string>
-  <string name="olympic_round">Olimpik Tur</string>
-  <string name="wa_1440_junior_men">WA 1440 genç erkek</string>
-  <string name="wa_1440_junior_women">WA 1440 genç bayan</string>
-  <string name="wa_1440_men_master_50">WA 1440 erkek master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 erkek master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 erkek master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 erkek büyük</string>
-  <string name="wa_1440_women_master_50">WA 1440 bayan master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 bayan master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 bayan master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 büyük bayan</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet erkek</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet bayan</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 genç erkek</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 genç bayan</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 erkek master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 erkek master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 erkek master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 büyük erkek</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 bayan master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 bayan master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 bayan master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 büyük bayan</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">Amerikan</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol IV</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Yarım Metrik IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Orta düzey</string>
-  <string name="junior_canberra">Küçük Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 klasik/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 klasik/Dakota: minik</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 klasik/Dakota: küçük/genç</string>
-  <string name="nfaa_600_cub">NFAA 600: minik</string>
-  <string name="nfaa_600_junior">NFAA 600: küçük/genç</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: minik</string>
-  <string name="nfaa_810_junior">NFAA/American 810: küçük/genç</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: minik</string>
-  <string name="nfaa_900_junior">NFAA/American 900: küçük/genç</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Açık işaretsiz 24 : Sarı halka</string>
-  <string name="big_game_36">Büyük oyun 36</string>
-  <string name="big_game_40">Büyük oyun 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Avustralya kombine kapalı</string>
+    <string name="australian_indoor_1">Avustralya Salon 1</string>
+    <string name="australian_indoor_2">Avustralya Salon 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 nokta</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA kombine</string>
+    <string name="match_round">Maç turu</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 SAlon: Yetişkin/genç</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 SAlon: Kulüp</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: minik</string>
+    <string name="flint_bowman_indoor">Flint Bowman Salon</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA bireysel makaralı eleme 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA bireysel makaralı eleme 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA bireysel makaralı eleme 50m</string>
+    <string name="wa_recurve_elimination_18">WA olimpik eleme 18m</string>
+    <string name="wa_recurve_elimination_50">WA olimpik eleme 50m</string>
+    <string name="wa_recurve_elimination_60">WA olimpik eleme 60m</string>
+    <string name="wa_recurve_elimination_70">WA olimpik eleme 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet erkek</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet bayan</string>
+    <string name="wa_compound_individual">WA makaralı bireysel</string>
+    <string name="wa_compound_qualification">WA makaralı Eleme</string>
+    <string name="wa_cub">WA kulüp</string>
+    <string name="wa_standard">WA standart</string>
+    <string name="olympic_round">Olimpik Tur</string>
+    <string name="wa_1440_junior_men">WA 1440 genç erkek</string>
+    <string name="wa_1440_junior_women">WA 1440 genç bayan</string>
+    <string name="wa_1440_men_master_50">WA 1440 erkek master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 erkek master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 erkek master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 erkek büyük</string>
+    <string name="wa_1440_women_master_50">WA 1440 bayan master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 bayan master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 bayan master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 büyük bayan</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet erkek</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet bayan</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 genç erkek</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 genç bayan</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 erkek master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 erkek master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 erkek master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 büyük erkek</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 bayan master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 bayan master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 bayan master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 büyük bayan</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">Amerikan</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol IV</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Yarım Metrik IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Orta düzey</string>
+    <string name="junior_canberra">Küçük Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 klasik/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 klasik/Dakota: minik</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 klasik/Dakota: küçük/genç</string>
+    <string name="nfaa_600_cub">NFAA 600: minik</string>
+    <string name="nfaa_600_junior">NFAA 600: küçük/genç</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: minik</string>
+    <string name="nfaa_810_junior">NFAA/American 810: küçük/genç</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: minik</string>
+    <string name="nfaa_900_junior">NFAA/American 900: küçük/genç</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Açık işaretsiz 24 : Sarı halka</string>
+    <string name="big_game_36">Büyük oyun 36</string>
+    <string name="big_game_40">Büyük oyun 40</string>
 </resources>
diff --git a/shared/src/main/res/values-tr/strings.xml b/shared/src/main/res/values-tr/strings.xml
index 9721d6c16..d9aeb563d 100644
--- a/shared/src/main/res/values-tr/strings.xml
+++ b/shared/src/main/res/values-tr/strings.xml
@@ -15,60 +15,60 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Olimpik Yay</string>
-  <string name="compound_bow">Makaralı Yay</string>
-  <string name="bare_bow">Çıplak yay</string>
-  <string name="long_bow">Geleneksel yay</string>
-  <string name="horse_bow">Osmanlı yayı</string>
-  <string name="yumi">Japon yayı</string>
-  <string name="sunny">Güneşli</string>
-  <string name="partly_cloudy">Parçalı Bulutlu</string>
-  <string name="cloudy">Bulutlu</string>
-  <string name="light_rain">Hafif Yağmur</string>
-  <string name="rain">Yağmurlu</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Küçük</string>
-  <string name="medium">Orta</string>
-  <string name="large">Büyük</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Belirsiz</string>
-  <string name="indoor">Salon</string>
-  <string name="wind">Rüzgar</string>
-  <string name="location">Yer</string>
-  <string name="bft_0">0 Bft: Rüzgarsız</string>
-  <string name="bft_1">1 Bft: Yapraklar hareket etmiyor</string>
-  <string name="bft_2">2 Bft: Yapraklar hareket etmeye başladı</string>
-  <string name="bft_3">3 Bft: Bayraklar hafif hareket etmeye başladı</string>
-  <string name="bft_4">4 Bft: Küçük dallar hareket etmeye başladı</string>
-  <string name="bft_5">5 Bft: Küçük ağaçlar hareket etmeye başladı</string>
-  <string name="bft_6">6 Bft: Büyük dallar hareket etmeye başladı</string>
-  <string name="bft_7">7 Bft: Tüm ağaçlar hareket ediyor</string>
-  <string name="bft_8">8 Bft: Küçük dallar kırıldı</string>
-  <string name="bft_9">9 Bft: Fırtına hasarı</string>
-  <string name="front">önden</string>
-  <string name="back">arkadan</string>
-  <string name="left">soldan</string>
-  <string name="right">sağdan</string>
-  <string name="left_front">Ön soldan</string>
-  <string name="right_front">ön sağdan</string>
-  <string name="left_back">sol arkadan</string>
-  <string name="right_back">sağ arkadan</string>
-  <string name="stop">DUR</string>
-  <string name="end_n">Bitiş %d</string>
-  <string name="miss">Iska</string>
-  <string name="backspace">Geri al tuşu</string>
-  <string name="accessibility_description_shot_n_score">Atış %1$d %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d tur</item>
-    <item quantity="other">%d turlar</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">% 1 $ d \ u00D7% 2 $ d ok</item>
-    <item quantity="other">% 1 $ d \ u00D7% 2 $ d oklar</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d bitiş başına ok</item>
-    <item quantity="other">%d bitiş başına oklar</item>
-  </plurals>
+    <string name="recurve_bow">Olimpik Yay</string>
+    <string name="compound_bow">Makaralı Yay</string>
+    <string name="bare_bow">Çıplak yay</string>
+    <string name="long_bow">Geleneksel yay</string>
+    <string name="horse_bow">Osmanlı yayı</string>
+    <string name="yumi">Japon yayı</string>
+    <string name="sunny">Güneşli</string>
+    <string name="partly_cloudy">Parçalı Bulutlu</string>
+    <string name="cloudy">Bulutlu</string>
+    <string name="light_rain">Hafif Yağmur</string>
+    <string name="rain">Yağmurlu</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Küçük</string>
+    <string name="medium">Orta</string>
+    <string name="large">Büyük</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Belirsiz</string>
+    <string name="indoor">Salon</string>
+    <string name="wind">Rüzgar</string>
+    <string name="location">Yer</string>
+    <string name="bft_0">0 Bft: Rüzgarsız</string>
+    <string name="bft_1">1 Bft: Yapraklar hareket etmiyor</string>
+    <string name="bft_2">2 Bft: Yapraklar hareket etmeye başladı</string>
+    <string name="bft_3">3 Bft: Bayraklar hafif hareket etmeye başladı</string>
+    <string name="bft_4">4 Bft: Küçük dallar hareket etmeye başladı</string>
+    <string name="bft_5">5 Bft: Küçük ağaçlar hareket etmeye başladı</string>
+    <string name="bft_6">6 Bft: Büyük dallar hareket etmeye başladı</string>
+    <string name="bft_7">7 Bft: Tüm ağaçlar hareket ediyor</string>
+    <string name="bft_8">8 Bft: Küçük dallar kırıldı</string>
+    <string name="bft_9">9 Bft: Fırtına hasarı</string>
+    <string name="front">önden</string>
+    <string name="back">arkadan</string>
+    <string name="left">soldan</string>
+    <string name="right">sağdan</string>
+    <string name="left_front">Ön soldan</string>
+    <string name="right_front">ön sağdan</string>
+    <string name="left_back">sol arkadan</string>
+    <string name="right_back">sağ arkadan</string>
+    <string name="stop">DUR</string>
+    <string name="end_n">Bitiş %d</string>
+    <string name="miss">Iska</string>
+    <string name="backspace">Geri al tuşu</string>
+    <string name="accessibility_description_shot_n_score">Atış %1$d %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d tur</item>
+        <item quantity="other">%d turlar</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">% 1 $ d \ u00D7% 2 $ d ok</item>
+        <item quantity="other">% 1 $ d \ u00D7% 2 $ d oklar</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d bitiş başına ok</item>
+        <item quantity="other">%d bitiş başına oklar</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-tr/target_faces.xml b/shared/src/main/res/values-tr/target_faces.xml
index 390347ac3..e970bf456 100644
--- a/shared/src/main/res/values-tr/target_faces.xml
+++ b/shared/src/main/res/values-tr/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Standart</string>
-  <string name="target_type_field_archery">Saha</string>
-  <string name="target_type_3d_archery">3 boyutlu</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Tam</string>
-  <string name="wa_6_ring">WA 6 Halka</string>
-  <string name="wa_5_ring">WA 5 Halka</string>
-  <string name="wa_3_ring">WA 3 Halka</string>
-  <string name="vegas_3_spot">Vegas 3 Nokta</string>
-  <string name="vertical_3_spot">WA Dikey 3 Nokta</string>
-  <string name="wa_3_ring_3_spot">WA 3 Halka 3 Nokta</string>
-  <string name="nfaa_field">NFAA Arazi</string>
-  <string name="nfaa_expert_field">NFAA Uzman Arazi</string>
-  <string name="nfaa_hunter">NFAA Avcı</string>
-  <string name="nfaa_indoor">NFAA Salon</string>
-  <string name="nfaa_indoor_5_spot">NFAA Salon 5 Nokta</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Arazi</string>
-  <string name="hit_or_miss">Vur veya Iskala</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Hayvan</string>
-  <string name="nfaa_animal">NFAA Hayvan</string>
-  <string name="nfas_field">NFAS Arazi</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Dönemi</string>
-  <string name="wa_field_3_spot">WA Alan 3 Nokta</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Havalandırma Borusu</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Renkli (10-1 ters)</string>
-  <string name="recurve_style_x_1">Yansım biçimi (X-1)</string>
-  <string name="recurve_style_10_1">Yansım biçimi (10-1)</string>
-  <string name="recurve_style_x_5">Yansım biçimi (X-5)</string>
-  <string name="recurve_style_10_5">Yansım biçimi (10-5)</string>
-  <string name="recurve_style_x_6">Yansım biçimi (X-6)</string>
-  <string name="recurve_style_10_6">Yansım biçimi (10-6)</string>
-  <string name="recurve_style_x_8">Yansım biçimi (X-8)</string>
-  <string name="recurve_style_10_8">Yansım biçimi (10-8)</string>
-  <string name="compound_style">Bileşik stil</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Standart</string>
+    <string name="target_type_field_archery">Saha</string>
+    <string name="target_type_3d_archery">3 boyutlu</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Tam</string>
+    <string name="wa_6_ring">WA 6 Halka</string>
+    <string name="wa_5_ring">WA 5 Halka</string>
+    <string name="wa_3_ring">WA 3 Halka</string>
+    <string name="vegas_3_spot">Vegas 3 Nokta</string>
+    <string name="vertical_3_spot">WA Dikey 3 Nokta</string>
+    <string name="wa_3_ring_3_spot">WA 3 Halka 3 Nokta</string>
+    <string name="nfaa_field">NFAA Arazi</string>
+    <string name="nfaa_expert_field">NFAA Uzman Arazi</string>
+    <string name="nfaa_hunter">NFAA Avcı</string>
+    <string name="nfaa_indoor">NFAA Salon</string>
+    <string name="nfaa_indoor_5_spot">NFAA Salon 5 Nokta</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Arazi</string>
+    <string name="hit_or_miss">Vur veya Iskala</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Hayvan</string>
+    <string name="nfaa_animal">NFAA Hayvan</string>
+    <string name="nfas_field">NFAS Arazi</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Dönemi</string>
+    <string name="wa_field_3_spot">WA Alan 3 Nokta</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Havalandırma Borusu</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Renkli (10-1 ters)</string>
+    <string name="recurve_style_x_1">Yansım biçimi (X-1)</string>
+    <string name="recurve_style_10_1">Yansım biçimi (10-1)</string>
+    <string name="recurve_style_x_5">Yansım biçimi (X-5)</string>
+    <string name="recurve_style_10_5">Yansım biçimi (10-5)</string>
+    <string name="recurve_style_x_6">Yansım biçimi (X-6)</string>
+    <string name="recurve_style_10_6">Yansım biçimi (10-6)</string>
+    <string name="recurve_style_x_8">Yansım biçimi (X-8)</string>
+    <string name="recurve_style_10_8">Yansım biçimi (10-8)</string>
+    <string name="compound_style">Bileşik stil</string>
 </resources>
diff --git a/shared/src/main/res/values-uk/rounds.xml b/shared/src/main/res/values-uk/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-uk/rounds.xml
+++ b/shared/src/main/res/values-uk/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-uk/strings.xml b/shared/src/main/res/values-uk/strings.xml
index c499bd5c8..fc0a5c010 100644
--- a/shared/src/main/res/values-uk/strings.xml
+++ b/shared/src/main/res/values-uk/strings.xml
@@ -15,66 +15,66 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="one">%d round</item>
-    <item quantity="few">%d rounds</item>
-    <item quantity="many">%d rounds</item>
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
-    <item quantity="few">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="many">%1$d \u00D7 %2$d arrows</item>
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
-    <item quantity="few">%d arrows per end</item>
-    <item quantity="many">%d arrows per end</item>
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="one">%d round</item>
+        <item quantity="few">%d rounds</item>
+        <item quantity="many">%d rounds</item>
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+        <item quantity="few">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="many">%1$d \u00D7 %2$d arrows</item>
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="one">%d arrow per end</item>
+        <item quantity="few">%d arrows per end</item>
+        <item quantity="many">%d arrows per end</item>
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-uk/target_faces.xml b/shared/src/main/res/values-uk/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-uk/target_faces.xml
+++ b/shared/src/main/res/values-uk/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-vi/rounds.xml b/shared/src/main/res/values-vi/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-vi/rounds.xml
+++ b/shared/src/main/res/values-vi/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-vi/strings.xml b/shared/src/main/res/values-vi/strings.xml
index 66eaca862..db5031e36 100644
--- a/shared/src/main/res/values-vi/strings.xml
+++ b/shared/src/main/res/values-vi/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">Recurve bow</string>
-  <string name="compound_bow">Compound bow</string>
-  <string name="bare_bow">Bare bow</string>
-  <string name="long_bow">Long bow</string>
-  <string name="horse_bow">Horse bow</string>
-  <string name="yumi">Yumi</string>
-  <string name="sunny">Sunny</string>
-  <string name="partly_cloudy">Partly cloudy</string>
-  <string name="cloudy">Cloudy</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">Recurve bow</string>
+    <string name="compound_bow">Compound bow</string>
+    <string name="bare_bow">Bare bow</string>
+    <string name="long_bow">Long bow</string>
+    <string name="horse_bow">Horse bow</string>
+    <string name="yumi">Yumi</string>
+    <string name="sunny">Sunny</string>
+    <string name="partly_cloudy">Partly cloudy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-vi/target_faces.xml b/shared/src/main/res/values-vi/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-vi/target_faces.xml
+++ b/shared/src/main/res/values-vi/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-zh-rCN/rounds.xml b/shared/src/main/res/values-zh-rCN/rounds.xml
index ad938fe01..be34956f7 100644
--- a/shared/src/main/res/values-zh-rCN/rounds.xml
+++ b/shared/src/main/res/values-zh-rCN/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">澳大利亚室内 1</string>
-  <string name="australian_indoor_2">澳大利亚室内 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">斯塔福德</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">朴茨茅斯</string>
-  <string name="worcester">伍斯特</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 室内: 成人/青年</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 室内: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman 室内</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 60</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet 男子</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA 标准</string>
-  <string name="olympic_round">奥运会</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">阿尔比恩</string>
-  <string name="american">美国</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">赫里福德</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">阿德莱德</string>
-  <string name="brisbane">布里斯班</string>
-  <string name="canberra">堪培拉</string>
-  <string name="darwin">达尔文</string>
-  <string name="drake">德雷克</string>
-  <string name="fremantle">里曼特尔</string>
-  <string name="geelong">吉隆</string>
-  <string name="grange">格兰奇</string>
-  <string name="hobart">霍巴特</string>
-  <string name="holt">霍尔特</string>
-  <string name="horsham">霍舍姆</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">墨尔本</string>
-  <string name="newcastle">纽卡斯尔</string>
-  <string name="perth">珀斯</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">悉尼</string>
-  <string name="townsville">汤斯维尔</string>
-  <string name="wollongong">伍伦贡</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">澳大利亚室内 1</string>
+    <string name="australian_indoor_2">澳大利亚室内 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">斯塔福德</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">朴茨茅斯</string>
+    <string name="worcester">伍斯特</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 室内: 成人/青年</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 室内: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman 室内</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 60</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet 男子</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA 标准</string>
+    <string name="olympic_round">奥运会</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">阿尔比恩</string>
+    <string name="american">美国</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">赫里福德</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">阿德莱德</string>
+    <string name="brisbane">布里斯班</string>
+    <string name="canberra">堪培拉</string>
+    <string name="darwin">达尔文</string>
+    <string name="drake">德雷克</string>
+    <string name="fremantle">里曼特尔</string>
+    <string name="geelong">吉隆</string>
+    <string name="grange">格兰奇</string>
+    <string name="hobart">霍巴特</string>
+    <string name="holt">霍尔特</string>
+    <string name="horsham">霍舍姆</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">墨尔本</string>
+    <string name="newcastle">纽卡斯尔</string>
+    <string name="perth">珀斯</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">悉尼</string>
+    <string name="townsville">汤斯维尔</string>
+    <string name="wollongong">伍伦贡</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-zh-rCN/strings.xml b/shared/src/main/res/values-zh-rCN/strings.xml
index 3d32cdc8f..f35422258 100644
--- a/shared/src/main/res/values-zh-rCN/strings.xml
+++ b/shared/src/main/res/values-zh-rCN/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">反曲弓</string>
-  <string name="compound_bow">复合弓</string>
-  <string name="bare_bow">光弓</string>
-  <string name="long_bow">长弓</string>
-  <string name="horse_bow">马弓</string>
-  <string name="yumi">和弓</string>
-  <string name="sunny">晴</string>
-  <string name="partly_cloudy">局部多云</string>
-  <string name="cloudy">阴天</string>
-  <string name="light_rain">小雨</string>
-  <string name="rain">雨</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">迷你</string>
-  <string name="small">小</string>
-  <string name="medium">中</string>
-  <string name="large">大</string>
-  <string name="xlarge">极大</string>
-  <string name="unknown">未知</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">风</string>
-  <string name="location">地点</string>
-  <string name="bft_0">0 级: 无风</string>
-  <string name="bft_1">1 级: 树叶不动</string>
-  <string name="bft_2">2 级: 树叶轻微摇动</string>
-  <string name="bft_3">3 级: 旗帜开始轻微飘扬</string>
-  <string name="bft_4">4 级: 小树枝开始摇动</string>
-  <string name="bft_5">5 级: 小树摇摆</string>
-  <string name="bft_6">6 级: 大树枝摇摆</string>
-  <string name="bft_7">7 级: 大树摇动</string>
-  <string name="bft_8">8 级: 小树枝断裂</string>
-  <string name="bft_9">9 级: 破坏型风暴</string>
-  <string name="front">从前方</string>
-  <string name="back">从后方</string>
-  <string name="left">从左方</string>
-  <string name="right">从右方</string>
-  <string name="left_front">从左前方</string>
-  <string name="right_front">从右前方</string>
-  <string name="left_back">从左后方</string>
-  <string name="right_back">从右后方</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">反曲弓</string>
+    <string name="compound_bow">复合弓</string>
+    <string name="bare_bow">光弓</string>
+    <string name="long_bow">长弓</string>
+    <string name="horse_bow">马弓</string>
+    <string name="yumi">和弓</string>
+    <string name="sunny">晴</string>
+    <string name="partly_cloudy">局部多云</string>
+    <string name="cloudy">阴天</string>
+    <string name="light_rain">小雨</string>
+    <string name="rain">雨</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">迷你</string>
+    <string name="small">小</string>
+    <string name="medium">中</string>
+    <string name="large">大</string>
+    <string name="xlarge">极大</string>
+    <string name="unknown">未知</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">风</string>
+    <string name="location">地点</string>
+    <string name="bft_0">0 级: 无风</string>
+    <string name="bft_1">1 级: 树叶不动</string>
+    <string name="bft_2">2 级: 树叶轻微摇动</string>
+    <string name="bft_3">3 级: 旗帜开始轻微飘扬</string>
+    <string name="bft_4">4 级: 小树枝开始摇动</string>
+    <string name="bft_5">5 级: 小树摇摆</string>
+    <string name="bft_6">6 级: 大树枝摇摆</string>
+    <string name="bft_7">7 级: 大树摇动</string>
+    <string name="bft_8">8 级: 小树枝断裂</string>
+    <string name="bft_9">9 级: 破坏型风暴</string>
+    <string name="front">从前方</string>
+    <string name="back">从后方</string>
+    <string name="left">从左方</string>
+    <string name="right">从右方</string>
+    <string name="left_front">从左前方</string>
+    <string name="right_front">从右前方</string>
+    <string name="left_back">从左后方</string>
+    <string name="right_back">从右后方</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-zh-rCN/target_faces.xml b/shared/src/main/res/values-zh-rCN/target_faces.xml
index ff90b85f2..6f8a9488e 100644
--- a/shared/src/main/res/values-zh-rCN/target_faces.xml
+++ b/shared/src/main/res/values-zh-rCN/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">国际箭联全环靶</string>
-  <string name="wa_6_ring">国际箭联六环靶</string>
-  <string name="wa_5_ring">国际箭联五环靶</string>
-  <string name="wa_3_ring">国际箭联三环靶</string>
-  <string name="vegas_3_spot">Vegas三联靶</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">国际箭联三环三联靶</string>
-  <string name="nfaa_field">NFAA 原野靶</string>
-  <string name="nfaa_expert_field">NFAA 专家原野靶</string>
-  <string name="nfaa_hunter">NFAA 猎靶</string>
-  <string name="nfaa_indoor">NFAA 室内靶</string>
-  <string name="nfaa_indoor_5_spot">NFAA 室内五点靶</string>
-  <string name="worcester_face">伍斯特</string>
-  <string name="wa_field">世界箭联原野靶</string>
-  <string name="hit_or_miss">命中或未命中</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA 动物靶</string>
-  <string name="nfaa_animal">NFAA 动物靶</string>
-  <string name="nfas_field">NFAS 原野靶</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">国际箭联全环靶</string>
+    <string name="wa_6_ring">国际箭联六环靶</string>
+    <string name="wa_5_ring">国际箭联五环靶</string>
+    <string name="wa_3_ring">国际箭联三环靶</string>
+    <string name="vegas_3_spot">Vegas三联靶</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">国际箭联三环三联靶</string>
+    <string name="nfaa_field">NFAA 原野靶</string>
+    <string name="nfaa_expert_field">NFAA 专家原野靶</string>
+    <string name="nfaa_hunter">NFAA 猎靶</string>
+    <string name="nfaa_indoor">NFAA 室内靶</string>
+    <string name="nfaa_indoor_5_spot">NFAA 室内五点靶</string>
+    <string name="worcester_face">伍斯特</string>
+    <string name="wa_field">世界箭联原野靶</string>
+    <string name="hit_or_miss">命中或未命中</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA 动物靶</string>
+    <string name="nfaa_animal">NFAA 动物靶</string>
+    <string name="nfas_field">NFAS 原野靶</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/shared/src/main/res/values-zh-rTW/rounds.xml b/shared/src/main/res/values-zh-rTW/rounds.xml
index 8cc6d7b64..ee99a2683 100644
--- a/shared/src/main/res/values-zh-rTW/rounds.xml
+++ b/shared/src/main/res/values-zh-rTW/rounds.xml
@@ -15,208 +15,208 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Indoor -->
-  <string name="australian_combined_indoor">Australian Combined Indoor</string>
-  <string name="australian_indoor_1">Australian Indoor 1</string>
-  <string name="australian_indoor_2">Australian Indoor 2</string>
-  <string name="dair_380">DAIR 380</string>
-  <string name="wa_18_40cm">WA 18 (40cm)</string>
-  <string name="wa_18_60cm">WA 18 (60cm)</string>
-  <string name="wa_3_spot">WA 3 Spot</string>
-  <string name="wa_25">WA 25</string>
-  <string name="wa_combined">WA Combined</string>
-  <string name="match_round">Match Round</string>
-  <string name="stafford">Stafford</string>
-  <string name="bray_i">Bray I</string>
-  <string name="bray_ii">Bray II</string>
-  <string name="portsmouth">Portsmouth</string>
-  <string name="worcester">Worcester</string>
-  <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
-  <string name="nasp_300">NASP 300</string>
-  <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
-  <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
-  <!-- WA -->
-  <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
-  <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
-  <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
-  <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
-  <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
-  <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
-  <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
-  <string name="wa_50">WA 50</string>
-  <string name="wa_60">WA 60</string>
-  <string name="wa_70">WA 70</string>
-  <string name="wa_900">WA 900</string>
-  <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
-  <string name="wa_compound_individual">WA Compound Individual</string>
-  <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
-  <string name="wa_standard">WA Standard</string>
-  <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
-  <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
-  <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
-  <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
-  <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
-  <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
-  <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
-  <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
-  <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
-  <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
-  <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
-  <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
-  <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
-  <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
-  <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
-  <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
-  <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
-  <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
-  <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
-  <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
-  <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
-  <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
-  <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
-  <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
-  <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
-  <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
-  <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
-  <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
-  <!-- ArcheryGB -->
-  <string name="albion">Albion</string>
-  <string name="american">American</string>
-  <string name="bristol_i">Bristol I</string>
-  <string name="bristol_ii">Bristol II</string>
-  <string name="bristol_iii">Bristol III</string>
-  <string name="bristol_iv">Bristol IV</string>
-  <string name="bristol_v">Bristol V</string>
-  <string name="hereford">Hereford</string>
-  <string name="short_junior_national">Short Junior National</string>
-  <string name="short_junior_warwick">Short Junior Warwick</string>
-  <string name="short_junior_western">Short Junior Western</string>
-  <string name="short_junior_windsor">Short Junior Windsor</string>
-  <string name="junior_national">Junior National</string>
-  <string name="junior_warwick">Junior Warwick</string>
-  <string name="junior_western">Junior Western</string>
-  <string name="junior_windsor">Junior Windsor</string>
-  <string name="short_national">Short National</string>
-  <string name="short_warwick">Short Warwick</string>
-  <string name="short_western">Short Western</string>
-  <string name="short_windsor">Short Windsor</string>
-  <string name="national">National</string>
-  <string name="st_george">St. George</string>
-  <string name="st_nicholas">St. Nicholas</string>
-  <string name="warwick">Warwick</string>
-  <string name="western">Western</string>
-  <string name="windsor">Windsor</string>
-  <string name="york">York</string>
-  <string name="long_national">Long National</string>
-  <string name="long_warwick">Long Warwick</string>
-  <string name="long_western">Long Western</string>
-  <string name="new_national">New National</string>
-  <string name="new_warwick">New Warwick</string>
-  <string name="new_western">New Western</string>
-  <string name="frostbite">Frostbite</string>
-  <string name="half_metric_i">Half Metric I</string>
-  <string name="half_metric_ii">Half Metric II</string>
-  <string name="half_metric_iii">Half Metric III</string>
-  <string name="half_metric_iv">Half Metric IV</string>
-  <string name="half_metric_v">Half Metric V</string>
-  <string name="short_metric_i">Short Metric I</string>
-  <string name="short_metric_ii">Short Metric II</string>
-  <string name="short_metric_iii">Short Metric III</string>
-  <string name="short_metric_iv">Short Metric IV</string>
-  <string name="short_metric_v">Short Metric V</string>
-  <string name="metric_i">Metric I</string>
-  <string name="metric_ii">Metric II</string>
-  <string name="metric_iii">Metric III</string>
-  <string name="metric_iv">Metric IV</string>
-  <string name="metric_v">Metric V</string>
-  <string name="long_metric_i">Long Metric I</string>
-  <string name="long_metric_ii">Long Metric II</string>
-  <string name="long_metric_iii">Long Metric III</string>
-  <string name="long_metric_iv">Long Metric IV</string>
-  <string name="long_metric_v">Long Metric V</string>
-  <string name="long_metric_gents">Long Metric (Gentlemen)</string>
-  <string name="long_metric_ladies">Long Metric (Ladies)</string>
-  <!-- Australia -->
-  <string name="adelaide">Adelaide</string>
-  <string name="brisbane">Brisbane</string>
-  <string name="canberra">Canberra</string>
-  <string name="darwin">Darwin</string>
-  <string name="drake">Drake</string>
-  <string name="fremantle">Fremantle</string>
-  <string name="geelong">Geelong</string>
-  <string name="grange">Grange</string>
-  <string name="hobart">Hobart</string>
-  <string name="holt">Holt</string>
-  <string name="horsham">Horsham</string>
-  <string name="intermediate">Intermediate</string>
-  <string name="junior_canberra">Junior Canberra</string>
-  <string name="launcheston">Launcheston</string>
-  <string name="long_brisbane">Long Brisbane</string>
-  <string name="long_sydney">Long Sydney</string>
-  <string name="melbourne">Melbourne</string>
-  <string name="newcastle">Newcastle</string>
-  <string name="perth">Perth</string>
-  <string name="short_adelaide">Short Adelaide</string>
-  <string name="short_canberra">Short Canberra</string>
-  <string name="sydney">Sydney</string>
-  <string name="townsville">Townsville</string>
-  <string name="wollongong">Wollongong</string>
-  <!-- Field -->
-  <string name="nfaa_600">NFAA 600</string>
-  <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
-  <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
-  <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
-  <string name="nfaa_600_cub">NFAA 600: Cub</string>
-  <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
-  <string name="nfaa_810">NFAA/American 810</string>
-  <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
-  <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
-  <string name="nfaa_900">NFAA/American 900</string>
-  <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
-  <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
-  <string name="canadian_900">Canadian 900</string>
-  <string name="t2s_900">T2S 900</string>
-  <string name="ifaa_animal_280">IFAA Animal 280</string>
-  <string name="ifaa_animal_300">IFAA Animal 300</string>
-  <string name="ifaa_animal_560">IFAA Animal 560</string>
-  <string name="nfaa_international_150">NFAA/IFAA International 150</string>
-  <string name="nfaa_international_300">NFAA/IFAA International 300</string>
-  <string name="nfaa_animal_280">NFAA Animal 280</string>
-  <string name="nfaa_animal_300">NFAA Animal 300</string>
-  <string name="nfaa_animal_588">NFAA Animal 588</string>
-  <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
-  <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
-  <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
-  <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
-  <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
-  <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
-  <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
-  <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
-  <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
-  <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
-  <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
-  <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
-  <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
-  <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
-  <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
-  <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
-  <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
-  <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
-  <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
-  <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
-  <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
-  <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
-  <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
-  <string name="big_game_36">Big Game 36</string>
-  <string name="big_game_40">Big Game 40</string>
+    <!-- Indoor -->
+    <string name="australian_combined_indoor">Australian Combined Indoor</string>
+    <string name="australian_indoor_1">Australian Indoor 1</string>
+    <string name="australian_indoor_2">Australian Indoor 2</string>
+    <string name="dair_380">DAIR 380</string>
+    <string name="wa_18_40cm">WA 18 (40cm)</string>
+    <string name="wa_18_60cm">WA 18 (60cm)</string>
+    <string name="wa_3_spot">WA 3 Spot</string>
+    <string name="wa_25">WA 25</string>
+    <string name="wa_combined">WA Combined</string>
+    <string name="match_round">Match Round</string>
+    <string name="stafford">Stafford</string>
+    <string name="bray_i">Bray I</string>
+    <string name="bray_ii">Bray II</string>
+    <string name="portsmouth">Portsmouth</string>
+    <string name="worcester">Worcester</string>
+    <string name="vegas_300">Vegas 300</string>
+    <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
+    <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+    <string name="nasp_300">NASP 300</string>
+    <string name="nfaa_420">NFAA 420</string>
+    <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+    <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
+    <!-- WA -->
+    <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
+    <string name="wa_individual_compound_eleminiation_40">WA Individual Compound Elimination 40m</string>
+    <string name="wa_individual_compound_eleminiation_50">WA Individual Compound Elimination 50m</string>
+    <string name="wa_recurve_elimination_18">WA Recurve Elimination 18m</string>
+    <string name="wa_recurve_elimination_50">WA Recurve Elimination 50m</string>
+    <string name="wa_recurve_elimination_60">WA Recurve Elimination 60m</string>
+    <string name="wa_recurve_elimination_70">WA Recurve Elimination 70m</string>
+    <string name="wa_50">WA 50</string>
+    <string name="wa_60">WA 60</string>
+    <string name="wa_70">WA 70</string>
+    <string name="wa_900">WA 900</string>
+    <string name="wa_bowman">WA Bowman</string>
+    <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
+    <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+    <string name="wa_compound_individual">WA Compound Individual</string>
+    <string name="wa_compound_qualification">WA Compound Qualification</string>
+    <string name="wa_cub">WA Cub</string>
+    <string name="wa_standard">WA Standard</string>
+    <string name="olympic_round">Olympic Round</string>
+    <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
+    <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+    <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
+    <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
+    <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
+    <string name="wa_1440_men_senior">WA 1440 Men Senior</string>
+    <string name="wa_1440_women_master_50">WA 1440 Women Master 50+</string>
+    <string name="wa_1440_women_master_60">WA 1440 Women Master 60+</string>
+    <string name="wa_1440_women_master_70">WA 1440 Women Master 70+</string>
+    <string name="wa_1440_women_senior">WA 1440 Women Senior</string>
+    <string name="half_wa_1440_cadet_men">Half WA 1440 Cadet Men</string>
+    <string name="half_wa_1440_cadet_women">Half WA 1440 Cadet Women</string>
+    <string name="half_wa_1440_junior_men">Half WA 1440 Junior Men</string>
+    <string name="half_wa_1440_junior_women">Half WA 1440 Junior Women</string>
+    <string name="half_wa_1440_men_master_50">Half WA 1440 Men Master 50+</string>
+    <string name="half_wa_1440_men_master_60">Half WA 1440 Men Master 60+</string>
+    <string name="half_wa_1440_men_master_70">Half WA 1440 Men Master 70+</string>
+    <string name="half_wa_1440_men_senior">Half WA 1440 Men Senior</string>
+    <string name="half_wa_1440_women_master_50">Half WA 1440 Women Master 50+</string>
+    <string name="half_wa_1440_women_master_60">Half WA 1440 Women Master 60+</string>
+    <string name="half_wa_1440_women_master_70">Half WA 1440 Women Master 70+</string>
+    <string name="half_wa_1440_women_senior">Half WA 1440 Women Senior</string>
+    <string name="wa_double_720_30_80cm">WA Double 720 30m (80cm)</string>
+    <string name="wa_double_720_40_80cm">WA Double 720 40m (80cm)</string>
+    <string name="wa_double_720_40_122cm">WA Double 720 40m (122cm)</string>
+    <string name="wa_double_720_50_80cm">WA Double 720 50m (80cm)</string>
+    <string name="wa_double_720_50_122cm">WA Double 720 50m (122cm)</string>
+    <string name="wa_double_720_60_122cm">WA Double 720 60m (122cm)</string>
+    <string name="wa_double_720_70_122cm">WA Double 720 70m (122cm)</string>
+    <!-- ArcheryGB -->
+    <string name="albion">Albion</string>
+    <string name="american">American</string>
+    <string name="bristol_i">Bristol I</string>
+    <string name="bristol_ii">Bristol II</string>
+    <string name="bristol_iii">Bristol III</string>
+    <string name="bristol_iv">Bristol IV</string>
+    <string name="bristol_v">Bristol V</string>
+    <string name="hereford">Hereford</string>
+    <string name="short_junior_national">Short Junior National</string>
+    <string name="short_junior_warwick">Short Junior Warwick</string>
+    <string name="short_junior_western">Short Junior Western</string>
+    <string name="short_junior_windsor">Short Junior Windsor</string>
+    <string name="junior_national">Junior National</string>
+    <string name="junior_warwick">Junior Warwick</string>
+    <string name="junior_western">Junior Western</string>
+    <string name="junior_windsor">Junior Windsor</string>
+    <string name="short_national">Short National</string>
+    <string name="short_warwick">Short Warwick</string>
+    <string name="short_western">Short Western</string>
+    <string name="short_windsor">Short Windsor</string>
+    <string name="national">National</string>
+    <string name="st_george">St. George</string>
+    <string name="st_nicholas">St. Nicholas</string>
+    <string name="warwick">Warwick</string>
+    <string name="western">Western</string>
+    <string name="windsor">Windsor</string>
+    <string name="york">York</string>
+    <string name="long_national">Long National</string>
+    <string name="long_warwick">Long Warwick</string>
+    <string name="long_western">Long Western</string>
+    <string name="new_national">New National</string>
+    <string name="new_warwick">New Warwick</string>
+    <string name="new_western">New Western</string>
+    <string name="frostbite">Frostbite</string>
+    <string name="half_metric_i">Half Metric I</string>
+    <string name="half_metric_ii">Half Metric II</string>
+    <string name="half_metric_iii">Half Metric III</string>
+    <string name="half_metric_iv">Half Metric IV</string>
+    <string name="half_metric_v">Half Metric V</string>
+    <string name="short_metric_i">Short Metric I</string>
+    <string name="short_metric_ii">Short Metric II</string>
+    <string name="short_metric_iii">Short Metric III</string>
+    <string name="short_metric_iv">Short Metric IV</string>
+    <string name="short_metric_v">Short Metric V</string>
+    <string name="metric_i">Metric I</string>
+    <string name="metric_ii">Metric II</string>
+    <string name="metric_iii">Metric III</string>
+    <string name="metric_iv">Metric IV</string>
+    <string name="metric_v">Metric V</string>
+    <string name="long_metric_i">Long Metric I</string>
+    <string name="long_metric_ii">Long Metric II</string>
+    <string name="long_metric_iii">Long Metric III</string>
+    <string name="long_metric_iv">Long Metric IV</string>
+    <string name="long_metric_v">Long Metric V</string>
+    <string name="long_metric_gents">Long Metric (Gentlemen)</string>
+    <string name="long_metric_ladies">Long Metric (Ladies)</string>
+    <!-- Australia -->
+    <string name="adelaide">Adelaide</string>
+    <string name="brisbane">Brisbane</string>
+    <string name="canberra">Canberra</string>
+    <string name="darwin">Darwin</string>
+    <string name="drake">Drake</string>
+    <string name="fremantle">Fremantle</string>
+    <string name="geelong">Geelong</string>
+    <string name="grange">Grange</string>
+    <string name="hobart">Hobart</string>
+    <string name="holt">Holt</string>
+    <string name="horsham">Horsham</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="junior_canberra">Junior Canberra</string>
+    <string name="launcheston">Launcheston</string>
+    <string name="long_brisbane">Long Brisbane</string>
+    <string name="long_sydney">Long Sydney</string>
+    <string name="melbourne">Melbourne</string>
+    <string name="newcastle">Newcastle</string>
+    <string name="perth">Perth</string>
+    <string name="short_adelaide">Short Adelaide</string>
+    <string name="short_canberra">Short Canberra</string>
+    <string name="sydney">Sydney</string>
+    <string name="townsville">Townsville</string>
+    <string name="wollongong">Wollongong</string>
+    <!-- Field -->
+    <string name="nfaa_600">NFAA 600</string>
+    <string name="nfaa_600_classic">NFAA 600 Classic/Dakota</string>
+    <string name="nfaa_600_classic_cub">NFAA 600 Classic/Dakota: Cub</string>
+    <string name="nfaa_600_classic_junior">NFAA 600 Classic/Dakota: Junior/Youth</string>
+    <string name="nfaa_600_cub">NFAA 600: Cub</string>
+    <string name="nfaa_600_junior">NFAA 600: Junior/Youth</string>
+    <string name="nfaa_810">NFAA/American 810</string>
+    <string name="nfaa_810_cub">NFAA/American 810: Cub</string>
+    <string name="nfaa_810_junior">NFAA/American 810: Junior/Youth</string>
+    <string name="nfaa_900">NFAA/American 900</string>
+    <string name="nfaa_900_cub">NFAA/American 900: Cub</string>
+    <string name="nfaa_900_junior">NFAA/American 900: Junior/Youth</string>
+    <string name="canadian_900">Canadian 900</string>
+    <string name="t2s_900">T2S 900</string>
+    <string name="ifaa_animal_280">IFAA Animal 280</string>
+    <string name="ifaa_animal_300">IFAA Animal 300</string>
+    <string name="ifaa_animal_560">IFAA Animal 560</string>
+    <string name="nfaa_international_150">NFAA/IFAA International 150</string>
+    <string name="nfaa_international_300">NFAA/IFAA International 300</string>
+    <string name="nfaa_animal_280">NFAA Animal 280</string>
+    <string name="nfaa_animal_300">NFAA Animal 300</string>
+    <string name="nfaa_animal_588">NFAA Animal 588</string>
+    <string name="nfaa_lake_of_woods">NFAA Lake of the Woods</string>
+    <string name="nfaa_expert_field_300">NFAA/IFAA Expert Field 300</string>
+    <string name="nfaa_expert_field_only_560">NFAA/IFAA Expert Field Only 560</string>
+    <string name="nfaa_field_280">NFAA/IFAA Field 280</string>
+    <string name="nfaa_field_300">NFAA/IFAA Field 300</string>
+    <string name="nfaa_field_560">NFAA/IFAA Field 560</string>
+    <string name="nfaa_hunter_280">NFAA/IFAA Hunter 280</string>
+    <string name="nfaa_hunter_300">NFAA/IFAA Hunter 300</string>
+    <string name="nfaa_hunter_560">NFAA/IFAA Hunter 560</string>
+    <string name="nfaa_field_hunter_560">NFAA/IFAA Field/Hunter 560</string>
+    <string name="wa_field_unmarked_marked_red">WA Field 12 Unmarked/12 Marked: Red Pegs</string>
+    <string name="wa_field_marked_12_red">WA Field Marked 12: Red Pegs</string>
+    <string name="wa_field_marked_24_red">WA Field Marked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_12_red">WA Field Unmarked 12: Red Pegs</string>
+    <string name="wa_field_unmarked_24_red">WA Field Unmarked 24: Red Pegs</string>
+    <string name="wa_field_unmarked_marked_blue">WA Field 12 Unmarked/12 Marked: Blue Pegs</string>
+    <string name="wa_field_marked_12_blue">WA Field Marked 12: Blue Pegs</string>
+    <string name="wa_field_marked_24_blue">WA Field Marked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_12_blue">WA Field Unmarked 12: Blue Pegs</string>
+    <string name="wa_field_unmarked_24_blue">WA Field Unmarked 24: Blue Pegs</string>
+    <string name="wa_field_unmarked_marked_yellow">WA Field 12 Unmarked/12 Marked: Yellow Pegs</string>
+    <string name="wa_field_marked_12_yellow">WA Field Marked 12: Yellow Pegs</string>
+    <string name="wa_field_marked_24_yellow">WA Field Marked 24: Yellow Pegs</string>
+    <string name="wa_field_unmarked_12_yellow">WA Field Unmarked 12: Yellow Pegs</string>
+    <string name="wa_field_unmarked_24_yellow">WA Field Unmarked 24: Yellow Pegs</string>
+    <string name="big_game_36">Big Game 36</string>
+    <string name="big_game_40">Big Game 40</string>
 </resources>
diff --git a/shared/src/main/res/values-zh-rTW/strings.xml b/shared/src/main/res/values-zh-rTW/strings.xml
index 497a05b5a..67128512c 100644
--- a/shared/src/main/res/values-zh-rTW/strings.xml
+++ b/shared/src/main/res/values-zh-rTW/strings.xml
@@ -15,57 +15,57 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="recurve_bow">反曲弓</string>
-  <string name="compound_bow">複合弓</string>
-  <string name="bare_bow">裸弓</string>
-  <string name="long_bow">長弓</string>
-  <string name="horse_bow">傳統弓</string>
-  <string name="yumi">和弓</string>
-  <string name="sunny">晴天</string>
-  <string name="partly_cloudy">部份多雲</string>
-  <string name="cloudy">陰天</string>
-  <string name="light_rain">Light rain</string>
-  <string name="rain">Rainy</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
-  <string name="mini">Mini</string>
-  <string name="small">Small</string>
-  <string name="medium">Medium</string>
-  <string name="large">Large</string>
-  <string name="xlarge">XLarge</string>
-  <string name="unknown">Unknown</string>
-  <string name="indoor">Indoor</string>
-  <string name="wind">Wind</string>
-  <string name="location">Location</string>
-  <string name="bft_0">0 Bft: Windless</string>
-  <string name="bft_1">1 Bft: Leaves do not move</string>
-  <string name="bft_2">2 Bft: Leaves begin to move</string>
-  <string name="bft_3">3 Bft: Light flags begin to move</string>
-  <string name="bft_4">4 Bft: Small branches begin to move</string>
-  <string name="bft_5">5 Bft: Small trees move</string>
-  <string name="bft_6">6 Bft: Big branches move</string>
-  <string name="bft_7">7 Bft: Complete trees move</string>
-  <string name="bft_8">8 Bft: Small branches break</string>
-  <string name="bft_9">9 Bft: Storm damage</string>
-  <string name="front">from front</string>
-  <string name="back">from back</string>
-  <string name="left">from left</string>
-  <string name="right">from right</string>
-  <string name="left_front">from front left</string>
-  <string name="right_front">from front right</string>
-  <string name="left_back">from back left</string>
-  <string name="right_back">from back right</string>
-  <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
-  <plurals name="rounds">
-    <item quantity="other">%d rounds</item>
-  </plurals>
-  <plurals name="ends_arrow">
-    <item quantity="other">%1$d \u00D7 %2$d arrows</item>
-  </plurals>
-  <plurals name="arrows_per_end">
-    <item quantity="other">%d arrows per end</item>
-  </plurals>
+    <string name="recurve_bow">反曲弓</string>
+    <string name="compound_bow">複合弓</string>
+    <string name="bare_bow">裸弓</string>
+    <string name="long_bow">長弓</string>
+    <string name="horse_bow">傳統弓</string>
+    <string name="yumi">和弓</string>
+    <string name="sunny">晴天</string>
+    <string name="partly_cloudy">部份多雲</string>
+    <string name="cloudy">陰天</string>
+    <string name="light_rain">Light rain</string>
+    <string name="rain">Rainy</string>
+    <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+    <string name="mini">Mini</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="xlarge">XLarge</string>
+    <string name="unknown">Unknown</string>
+    <string name="indoor">Indoor</string>
+    <string name="wind">Wind</string>
+    <string name="location">Location</string>
+    <string name="bft_0">0 Bft: Windless</string>
+    <string name="bft_1">1 Bft: Leaves do not move</string>
+    <string name="bft_2">2 Bft: Leaves begin to move</string>
+    <string name="bft_3">3 Bft: Light flags begin to move</string>
+    <string name="bft_4">4 Bft: Small branches begin to move</string>
+    <string name="bft_5">5 Bft: Small trees move</string>
+    <string name="bft_6">6 Bft: Big branches move</string>
+    <string name="bft_7">7 Bft: Complete trees move</string>
+    <string name="bft_8">8 Bft: Small branches break</string>
+    <string name="bft_9">9 Bft: Storm damage</string>
+    <string name="front">from front</string>
+    <string name="back">from back</string>
+    <string name="left">from left</string>
+    <string name="right">from right</string>
+    <string name="left_front">from front left</string>
+    <string name="right_front">from front right</string>
+    <string name="left_back">from back left</string>
+    <string name="right_back">from back right</string>
+    <string name="stop">STOP</string>
+    <string name="end_n">End %d</string>
+    <string name="miss">Miss</string>
+    <string name="backspace">Backspace</string>
+    <string name="accessibility_description_shot_n_score">Shot %1$d: %2$s</string>
+    <plurals name="rounds">
+        <item quantity="other">%d rounds</item>
+    </plurals>
+    <plurals name="ends_arrow">
+        <item quantity="other">%1$d \u00D7 %2$d arrows</item>
+    </plurals>
+    <plurals name="arrows_per_end">
+        <item quantity="other">%d arrows per end</item>
+    </plurals>
 </resources>
diff --git a/shared/src/main/res/values-zh-rTW/target_faces.xml b/shared/src/main/res/values-zh-rTW/target_faces.xml
index f7e59fc25..f754f2dbb 100644
--- a/shared/src/main/res/values-zh-rTW/target_faces.xml
+++ b/shared/src/main/res/values-zh-rTW/target_faces.xml
@@ -15,49 +15,49 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
-  <!-- Target names -->
-  <string name="wa_full">WA Full</string>
-  <string name="wa_6_ring">WA 6 Ring</string>
-  <string name="wa_5_ring">WA 5 Ring</string>
-  <string name="wa_3_ring">WA 3 Ring</string>
-  <string name="vegas_3_spot">Vegas 3 Spot</string>
-  <string name="vertical_3_spot">WA Vertical 3 Spot</string>
-  <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
-  <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
-  <string name="nfaa_hunter">NFAA Hunter</string>
-  <string name="nfaa_indoor">NFAA Indoor</string>
-  <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
-  <string name="worcester_face">Worcester</string>
-  <string name="wa_field">WA Field</string>
-  <string name="hit_or_miss">Hit or miss</string>
-  <string name="asa_3d">3D ASA</string>
-  <string name="asa_3d_14">3D ASA 14</string>
-  <string name="ibo_3d">3D IBO</string>
-  <string name="nfas_3d">3D NFAS</string>
-  <string name="dair_3d">3D Dair</string>
-  <string name="ifaa_animal">IFAA Animal</string>
-  <string name="nfaa_animal">NFAA Animal</string>
-  <string name="nfas_field">NFAS Field</string>
-  <string name="beursault">Beursault</string>
-  <string name="sca_period">SCA Period</string>
-  <string name="wa_field_3_spot">WA Field 3 Spot</string>
-  <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
-  <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
-  <string name="dbsc_blowpipe">DBSC Blowpipe</string>
-  <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
-  <string name="compound_style">Compound style</string>
+    <!-- Target groups -->
+    <string name="target_type_target_archery">Regular</string>
+    <string name="target_type_field_archery">Field</string>
+    <string name="target_type_3d_archery">3D</string>
+    <!-- Target names -->
+    <string name="wa_full">WA Full</string>
+    <string name="wa_6_ring">WA 6 Ring</string>
+    <string name="wa_5_ring">WA 5 Ring</string>
+    <string name="wa_3_ring">WA 3 Ring</string>
+    <string name="vegas_3_spot">Vegas 3 Spot</string>
+    <string name="vertical_3_spot">WA Vertical 3 Spot</string>
+    <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
+    <string name="nfaa_field">NFAA Field</string>
+    <string name="nfaa_expert_field">NFAA Expert Field</string>
+    <string name="nfaa_hunter">NFAA Hunter</string>
+    <string name="nfaa_indoor">NFAA Indoor</string>
+    <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
+    <string name="worcester_face">Worcester</string>
+    <string name="wa_field">WA Field</string>
+    <string name="hit_or_miss">Hit or miss</string>
+    <string name="asa_3d">3D ASA</string>
+    <string name="asa_3d_14">3D ASA 14</string>
+    <string name="ibo_3d">3D IBO</string>
+    <string name="nfas_3d">3D NFAS</string>
+    <string name="dair_3d">3D Dair</string>
+    <string name="ifaa_animal">IFAA Animal</string>
+    <string name="nfaa_animal">NFAA Animal</string>
+    <string name="nfas_field">NFAS Field</string>
+    <string name="beursault">Beursault</string>
+    <string name="sca_period">SCA Period</string>
+    <string name="wa_field_3_spot">WA Field 3 Spot</string>
+    <string name="wa_danage_3_spot">WA Danage 3 Spot</string>
+    <string name="wa_danage_6_spot">WA Danage 6 Spot</string>
+    <string name="dbsc_blowpipe">DBSC Blowpipe</string>
+    <!-- Scoring styles -->
+    <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+    <string name="recurve_style_x_1">Recurve style (X–1)</string>
+    <string name="recurve_style_10_1">Recurve style (10–1)</string>
+    <string name="recurve_style_x_5">Recurve style (X–5)</string>
+    <string name="recurve_style_10_5">Recurve style (10–5)</string>
+    <string name="recurve_style_x_6">Recurve style (X–6)</string>
+    <string name="recurve_style_10_6">Recurve style (10–6)</string>
+    <string name="recurve_style_x_8">Recurve style (X–8)</string>
+    <string name="recurve_style_10_8">Recurve style (10–8)</string>
+    <string name="compound_style">Compound style</string>
 </resources>
diff --git a/tools/rules-proguard.pro b/tools/rules-proguard.pro
index 3792ebe39..82a5045a4 100644
--- a/tools/rules-proguard.pro
+++ b/tools/rules-proguard.pro
@@ -1,9 +1,7 @@
 -renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable
 
 -keepattributes InnerClasses
 -keepattributes EnclosingMethod
--keepattributes *Annotation*
 -keepattributes Signature
 -keepattributes Exceptions
 
@@ -81,3 +79,10 @@
     java.lang.Object writeReplace();
     java.lang.Object readResolve();
 }
+
+# Crashlytics
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+-keep public class * extends java.lang.Exception
+-keep class com.crashlytics.** { *; }
+-dontwarn com.crashlytics.**
\ No newline at end of file
diff --git a/tools/script-play-store.gradle b/tools/script-play-store.gradle
index b3a1ba50e..451eea8a6 100644
--- a/tools/script-play-store.gradle
+++ b/tools/script-play-store.gradle
@@ -14,7 +14,7 @@
  */
 
 ext {
-    HAS_PLAY_STORE_SECRET = new File('googlePlayAndroidDeveloper.json').exists()
+    HAS_PLAY_STORE_SECRET = file('../googlePlayAndroidDeveloper.json').exists()
     HAS_GMS_SECRET = file('src/release/google-services.json').exists()
 }
 
@@ -31,9 +31,8 @@ if (hasProperty('CROWDIN_API_KEY')) {
 
     if (HAS_PLAY_STORE_SECRET) {
         play {
-            track 'beta'
-            untrackOld true
-            // uploadImages true
+            serviceAccountCredentials = file('../googlePlayAndroidDeveloper.json')
+            track = 'beta'
         }
     }
 }
diff --git a/tools/tools.iml b/tools/tools.iml
index 4cdf13439..b354449e0 100644
--- a/tools/tools.iml
+++ b/tools/tools.iml
@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":tools" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
       </configuration>
     </facet>
     <facet type="java-gradle" name="Java-Gradle">
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 65180966f..096c0e8f0 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -71,14 +71,21 @@ android {
 
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
-    implementation dependencies.supportWearable
+
+    implementation dependencies.androidxWearable
     compileOnly dependencies.wearable
-    implementation dependencies.supportCompat
-    implementation dependencies.supportWear
-//    implementation dependencies.androidxCoreKtx
+    implementation dependencies.androidxCore
+    implementation dependencies.androidxWear
+    implementation dependencies.androidxCoreKtx
+
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
+
+    implementation dependencies.archLifecycleExtensions
+    kapt dependencies.archLifecycleCompiler
+    implementation dependencies.archRoomRuntime
+    kapt dependencies.archRoomCompiler
+
     implementation project(':shared')
     implementation dependencies.kotlinStdlibJdk7
-    implementation "android.arch.lifecycle:livedata-core:$rootProject.ext.libraryVersion.architectureComponents"
 }
\ No newline at end of file
diff --git a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
index 8709eef4b..bff1fb6c5 100644
--- a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
@@ -19,7 +19,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.utils.WearWearableClient
 
@@ -43,7 +43,7 @@ class ApplicationInstance : SharedApplicationInstance() {
             return
         }
         val channel = NotificationChannel(DEFAULT_CHANNEL_ID, getString(R.string.notification_channel_default), NotificationManager.IMPORTANCE_DEFAULT)
-        context.systemService<NotificationManager>().createNotificationChannel(channel)
+        context.getSystemService<NotificationManager>()?.createNotificationChannel(channel)
     }
 
     override fun onTerminate() {
diff --git a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
index 78c5d9d3b..8591e824f 100644
--- a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
@@ -16,12 +16,13 @@
 package de.dreier.mytargets
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.Bundle
+import android.os.Vibrator
 import android.support.wearable.activity.ConfirmationActivity
 import android.support.wearable.activity.WearableActivity
 import android.view.View
-import androidx.core.content.systemService
+import androidx.core.content.getSystemService
+import androidx.databinding.DataBindingUtil
 import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
@@ -49,8 +50,10 @@ class InputActivity : WearableActivity(), TargetViewBase.OnEndFinishedListener {
 
         // Set up target view
         binding.target.initWithTarget(round.round.target)
-        binding.target.replaceWithEnd((0 until round.round.shotsPerEnd)
-                .map { Shot(it) }.toMutableList(), false)
+        binding.target.replaceWithEnd(
+            (0 until round.round.shotsPerEnd)
+                .map { Shot(it) }.toMutableList(), false
+        )
         binding.target.setOnTargetSetListener(this)
 
         // Ensure Moto 360 is not cut off at the bottom
@@ -91,12 +94,16 @@ class InputActivity : WearableActivity(), TargetViewBase.OnEndFinishedListener {
         }
         binding.circularProgress.setOnTimerFinishedListener {
             val intent = Intent(this@InputActivity, ConfirmationActivity::class.java)
-            intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE,
-                    ConfirmationActivity.SUCCESS_ANIMATION)
-            intent.putExtra(ConfirmationActivity.EXTRA_MESSAGE, this@InputActivity
-                    .getString(R.string.saved))
+            intent.putExtra(
+                ConfirmationActivity.EXTRA_ANIMATION_TYPE,
+                ConfirmationActivity.SUCCESS_ANIMATION
+            )
+            intent.putExtra(
+                ConfirmationActivity.EXTRA_MESSAGE, this@InputActivity
+                    .getString(R.string.saved)
+            )
             this@InputActivity.startActivity(intent)
-            VibratorCompat.vibrate(systemService(), 200)
+            getSystemService<Vibrator>()?.let { VibratorCompat.vibrate(it, 200) }
             this@InputActivity.finish()
             val end = End(index = 0, roundId = round.round.id)
             val ae = AugmentedEnd(end, shotList.toMutableList(), mutableListOf())
diff --git a/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt b/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
index f1d191f08..dfdcae742 100644
--- a/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
@@ -19,10 +19,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.LocalBroadcastManager
+import androidx.core.content.ContextCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.support.wearable.activity.WearableActivity
 import android.view.View
 import android.view.ViewGroup
diff --git a/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt b/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
index a356906a0..d6a48ffc7 100644
--- a/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
@@ -18,11 +18,11 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.LocalBroadcastManager
-import android.support.v7.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.recyclerview.widget.RecyclerView
 import android.support.wearable.activity.WearableActivity
 import android.view.LayoutInflater
 import android.view.View
@@ -108,7 +108,7 @@ class RoundActivity : WearableActivity() {
     override fun onEnterAmbient(ambientDetails: Bundle?) {
         super.onEnterAmbient(ambientDetails)
         binding.drawerLayout.setBackgroundResource(R.color.md_black_1000)
-        binding.recyclerViewEnds.adapter.notifyDataSetChanged()
+        binding.recyclerViewEnds.adapter?.notifyDataSetChanged()
         binding.wearableDrawerView.visibility = View.INVISIBLE
         binding.clock!!.time.visibility = View.VISIBLE
         binding.clock!!.time.text = DateFormat.getTimeInstance(DateFormat.SHORT).format(Date())
@@ -122,7 +122,7 @@ class RoundActivity : WearableActivity() {
     override fun onExitAmbient() {
         super.onExitAmbient()
         binding.drawerLayout.setBackgroundResource(R.color.md_wear_green_dark_background)
-        binding.recyclerViewEnds.adapter.notifyDataSetChanged()
+        binding.recyclerViewEnds.adapter?.notifyDataSetChanged()
         binding.wearableDrawerView.visibility = View.VISIBLE
         binding.clock!!.time.visibility = View.GONE
     }
diff --git a/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt b/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
index bc0ca84c8..c38e6bf2e 100644
--- a/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets
 
 import android.content.Context
 import android.graphics.*
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.MotionEvent
 import de.dreier.mytargets.shared.models.Target
diff --git a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
index 4e75bf68e..9dc10c484 100644
--- a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
@@ -14,15 +14,16 @@
  */
 package de.dreier.mytargets
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.wearable.activity.WearableActivity
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
+import androidx.fragment.app.FragmentActivity
+import androidx.wear.ambient.AmbientModeSupport
 import de.dreier.mytargets.databinding.ActivityTimerBinding
 import de.dreier.mytargets.databinding.FragmentTimerBinding
 import de.dreier.mytargets.shared.base.fragment.ETimerState
@@ -32,20 +33,20 @@ import de.dreier.mytargets.shared.models.TimerSettings
 /**
  * Demonstrates use of Navigation and Action Drawers on Android Wear.
  */
-class TimerActivity : WearableActivity(), MenuItem.OnMenuItemClickListener {
+class TimerActivity : FragmentActivity(), MenuItem.OnMenuItemClickListener, AmbientModeSupport.AmbientCallbackProvider {
 
     private lateinit var timerFragment: TimerFragment
     private lateinit var binding: ActivityTimerBinding
+    private lateinit var ambientController: AmbientModeSupport.AmbientController
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_timer)
-        setAmbientEnabled()
+        ambientController = AmbientModeSupport.attach(this)
 
         val settings = intent.getParcelableExtra<TimerSettings>(EXTRA_TIMER_SETTINGS)
         timerFragment = TimerFragment.getInstance(settings)
-        val fragmentManager = fragmentManager
-        fragmentManager.beginTransaction().replace(R.id.content_frame, timerFragment).commit()
+        supportFragmentManager.beginTransaction().replace(R.id.content_frame, timerFragment).commit()
 
         binding.primaryActionPeek
                 .setOnClickListener { binding.wearableDrawerView.controller.openDrawer() }
@@ -63,6 +64,8 @@ class TimerActivity : WearableActivity(), MenuItem.OnMenuItemClickListener {
         binding.wearableDrawerView.controller.peekDrawer()
     }
 
+    override fun getAmbientCallback(): AmbientModeSupport.AmbientCallback = MyAmbientCallback()
+
     override fun onMenuItemClick(menuItem: MenuItem): Boolean {
         when (menuItem.itemId) {
             R.id.menu_stop -> {
@@ -130,13 +133,28 @@ class TimerActivity : WearableActivity(), MenuItem.OnMenuItemClickListener {
             fun getInstance(settings: TimerSettings): TimerFragment {
                 val timer = TimerFragment()
                 val bundle = Bundle()
-                bundle.putParcelable(TimerFragmentBase.Companion.ARG_TIMER_SETTINGS, settings)
+                bundle.putParcelable(ARG_TIMER_SETTINGS, settings)
                 timer.arguments = bundle
                 return timer
             }
         }
     }
 
+    private class MyAmbientCallback : AmbientModeSupport.AmbientCallback() {
+
+        override fun onEnterAmbient(ambientDetails: Bundle?) {
+            // Handle entering ambient mode
+        }
+
+        override fun onExitAmbient() {
+            // Handle exiting ambient mode
+        }
+
+        override fun onUpdateAmbient() {
+            // Update the content
+        }
+    }
+
     companion object {
         const val EXTRA_TIMER_SETTINGS = "timer_settings"
     }
diff --git a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
index 5ddf18bcd..8baa39f18 100644
--- a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
@@ -17,11 +17,10 @@ package de.dreier.mytargets
 
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
-import android.support.v4.app.NotificationCompat
-import androidx.core.content.systemService
+import androidx.core.app.NotificationCompat
+import androidx.core.content.getSystemService
 import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import de.dreier.mytargets.shared.models.TimerSettings
@@ -63,11 +62,13 @@ class WearWearableListener : WearableListenerService() {
         val notificationIntent = Intent(this, RoundActivity::class.java)
         notificationIntent.putExtra(RoundActivity.EXTRA_ROUND, info.round)
         val pendingIntent = PendingIntent.getActivity(
-                this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT)
+            this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT
+        )
 
         // Create the ongoing notification
         val image = BitmapFactory.decodeResource(resources, R.drawable.wear_bg)
-        val notificationBuilder = NotificationCompat.Builder(this, ApplicationInstance.DEFAULT_CHANNEL_ID)
+        val notificationBuilder =
+            NotificationCompat.Builder(this, ApplicationInstance.DEFAULT_CHANNEL_ID)
                 .setContentTitle(info.title)
                 .setContentText(describe(info))
                 .setSmallIcon(R.mipmap.ic_launcher)
@@ -75,9 +76,9 @@ class WearWearableListener : WearableListenerService() {
                 .extend(NotificationCompat.WearableExtender().setBackground(image))
 
         // Build the notification and show it
-        val notificationManager = systemService<NotificationManager>()
-        notificationManager.cancel(NOTIFICATION_ID)
-        notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build())
+        val notificationManager = getSystemService<NotificationManager>()
+        notificationManager?.cancel(NOTIFICATION_ID)
+        notificationManager?.notify(NOTIFICATION_ID, notificationBuilder.build())
     }
 
     private fun describe(info: TrainingInfo): String {
diff --git a/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt b/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
index 9e36b2a5b..5dfa67477 100644
--- a/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
@@ -19,7 +19,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.TrainingInfo
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
diff --git a/wearable/src/main/res/layout/activity_input.xml b/wearable/src/main/res/layout/activity_input.xml
index f22c417e4..34a156e0e 100644
--- a/wearable/src/main/res/layout/activity_input.xml
+++ b/wearable/src/main/res/layout/activity_input.xml
@@ -25,7 +25,7 @@
             android:layout_height="match_parent"
             android:background="@color/md_wear_green_lighter_background"/>
 
-        <android.support.wear.widget.CircularProgressLayout
+        <androidx.wear.widget.CircularProgressLayout
             android:id="@+id/circularProgress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_close_white_18dp"/>
 
-        </android.support.wear.widget.CircularProgressLayout>
+        </androidx.wear.widget.CircularProgressLayout>
 
         <include
             android:id="@+id/clock"
diff --git a/wearable/src/main/res/layout/activity_main.xml b/wearable/src/main/res/layout/activity_main.xml
index 20d0b3e4e..184b9e8ee 100644
--- a/wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.wear.widget.drawer.WearableDrawerLayout
+    <androidx.wear.widget.drawer.WearableDrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -88,7 +88,7 @@
 
         </LinearLayout>
 
-        <android.support.wear.widget.drawer.WearableDrawerView
+        <androidx.wear.widget.drawer.WearableDrawerView
             android:id="@+id/wearableDrawerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -113,12 +113,12 @@
 
             </LinearLayout>
 
-        </android.support.wear.widget.drawer.WearableDrawerView>
+        </androidx.wear.widget.drawer.WearableDrawerView>
 
         <include
             android:id="@+id/clock"
             layout="@layout/layout_clock"/>
 
-    </android.support.wear.widget.drawer.WearableDrawerLayout>
+    </androidx.wear.widget.drawer.WearableDrawerLayout>
 
 </layout>
diff --git a/wearable/src/main/res/layout/activity_round.xml b/wearable/src/main/res/layout/activity_round.xml
index 2894fe7c1..d6bd7091f 100644
--- a/wearable/src/main/res/layout/activity_round.xml
+++ b/wearable/src/main/res/layout/activity_round.xml
@@ -16,7 +16,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.wear.widget.drawer.WearableDrawerLayout
+    <androidx.wear.widget.drawer.WearableDrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -24,7 +24,7 @@
         tools:context=".RoundActivity"
         tools:deviceIds="wear">
 
-        <android.support.wear.widget.WearableRecyclerView
+        <androidx.wear.widget.WearableRecyclerView
             android:id="@+id/recyclerViewEnds"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -32,7 +32,7 @@
             android:scrollbars="vertical"
             app:layoutManager="LinearLayoutManager"/>
 
-        <android.support.wear.widget.drawer.WearableDrawerView
+        <androidx.wear.widget.drawer.WearableDrawerView
             android:id="@+id/wearableDrawerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -57,12 +57,12 @@
 
             </LinearLayout>
 
-        </android.support.wear.widget.drawer.WearableDrawerView>
+        </androidx.wear.widget.drawer.WearableDrawerView>
 
         <include
             android:id="@+id/clock"
             layout="@layout/layout_clock"/>
 
-    </android.support.wear.widget.drawer.WearableDrawerLayout>
+    </androidx.wear.widget.drawer.WearableDrawerLayout>
 
 </layout>
diff --git a/wearable/src/main/res/layout/activity_timer.xml b/wearable/src/main/res/layout/activity_timer.xml
index b5402b32c..8bbe20347 100644
--- a/wearable/src/main/res/layout/activity_timer.xml
+++ b/wearable/src/main/res/layout/activity_timer.xml
@@ -15,7 +15,7 @@
   -->
 <layout>
 
-    <android.support.wear.widget.drawer.WearableDrawerLayout
+    <androidx.wear.widget.drawer.WearableDrawerLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-        <android.support.wear.widget.drawer.WearableDrawerView
+        <androidx.wear.widget.drawer.WearableDrawerView
             android:id="@+id/wearableDrawerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -45,7 +45,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.wear.widget.drawer.WearableActionDrawerView
+                <androidx.wear.widget.drawer.WearableActionDrawerView
                     android:id="@+id/bottom_action_drawer"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -72,8 +72,8 @@
 
             </LinearLayout>
 
-        </android.support.wear.widget.drawer.WearableDrawerView>
+        </androidx.wear.widget.drawer.WearableDrawerView>
 
-    </android.support.wear.widget.drawer.WearableDrawerLayout>
+    </androidx.wear.widget.drawer.WearableDrawerLayout>
 
 </layout>
diff --git a/wearable/src/main/res/values-af/strings.xml b/wearable/src/main/res/values-af/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-af/strings.xml
+++ b/wearable/src/main/res/values-af/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-ar/strings.xml b/wearable/src/main/res/values-ar/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-ar/strings.xml
+++ b/wearable/src/main/res/values-ar/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-ca/strings.xml b/wearable/src/main/res/values-ca/strings.xml
index b3ea2cf76..e232c77d4 100644
--- a/wearable/src/main/res/values-ca/strings.xml
+++ b/wearable/src/main/res/values-ca/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Guardat</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Guardat</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-cs/strings.xml b/wearable/src/main/res/values-cs/strings.xml
index 9edad321e..1d2949def 100644
--- a/wearable/src/main/res/values-cs/strings.xml
+++ b/wearable/src/main/res/values-cs/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Uloženo</string>
-  <string name="start_phone_app">Spusťte aplikaci ve svém telefonu...</string>
-  <string name="add_end">Přidat sadu</string>
-  <string name="toggle_timer">Přepnout časomíru</string>
-  <string name="start_timer">Spustit časomíru</string>
-  <string name="vibration">Vibrace</string>
-  <string name="sound">Zvuk</string>
-  <string name="today">dnes</string>
-  <string name="notification_channel_default">Výchozí</string>
+    <string name="saved">Uloženo</string>
+    <string name="start_phone_app">Spusťte aplikaci ve svém telefonu...</string>
+    <string name="add_end">Přidat sadu</string>
+    <string name="toggle_timer">Přepnout časomíru</string>
+    <string name="start_timer">Spustit časomíru</string>
+    <string name="vibration">Vibrace</string>
+    <string name="sound">Zvuk</string>
+    <string name="today">dnes</string>
+    <string name="notification_channel_default">Výchozí</string>
 </resources>
diff --git a/wearable/src/main/res/values-da/strings.xml b/wearable/src/main/res/values-da/strings.xml
index fd33538f5..22aa21df7 100644
--- a/wearable/src/main/res/values-da/strings.xml
+++ b/wearable/src/main/res/values-da/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Gemt</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Gemt</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-de/strings.xml b/wearable/src/main/res/values-de/strings.xml
index f1e2d1122..19ceabff8 100644
--- a/wearable/src/main/res/values-de/strings.xml
+++ b/wearable/src/main/res/values-de/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Gespeichert</string>
-  <string name="start_phone_app">Starte die App auf deinem Handy um fortzufahren…</string>
-  <string name="add_end">Neue Passe</string>
-  <string name="toggle_timer">Schießuhr ein/aus</string>
-  <string name="start_timer">Schießuhr starten</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Ton</string>
-  <string name="today">heute</string>
-  <string name="notification_channel_default">Standard</string>
+    <string name="saved">Gespeichert</string>
+    <string name="start_phone_app">Starte die App auf deinem Handy um fortzufahren…</string>
+    <string name="add_end">Neue Passe</string>
+    <string name="toggle_timer">Schießuhr ein/aus</string>
+    <string name="start_timer">Schießuhr starten</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Ton</string>
+    <string name="today">heute</string>
+    <string name="notification_channel_default">Standard</string>
 </resources>
diff --git a/wearable/src/main/res/values-el/strings.xml b/wearable/src/main/res/values-el/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-el/strings.xml
+++ b/wearable/src/main/res/values-el/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-es/strings.xml b/wearable/src/main/res/values-es/strings.xml
index 061c8242c..2a9ec9074 100644
--- a/wearable/src/main/res/values-es/strings.xml
+++ b/wearable/src/main/res/values-es/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Guardado</string>
-  <string name="start_phone_app">Iniciar la aplicación en su teléfono para seguir...</string>
-  <string name="add_end">Añadir Entrada</string>
-  <string name="toggle_timer">Activar cronometro</string>
-  <string name="start_timer">Iniciar cronómetro</string>
-  <string name="vibration">Vibración</string>
-  <string name="sound">Sonido</string>
-  <string name="today">hoy</string>
-  <string name="notification_channel_default">Predeterminado</string>
+    <string name="saved">Guardado</string>
+    <string name="start_phone_app">Iniciar la aplicación en su teléfono para seguir...</string>
+    <string name="add_end">Añadir Entrada</string>
+    <string name="toggle_timer">Activar cronometro</string>
+    <string name="start_timer">Iniciar cronómetro</string>
+    <string name="vibration">Vibración</string>
+    <string name="sound">Sonido</string>
+    <string name="today">hoy</string>
+    <string name="notification_channel_default">Predeterminado</string>
 </resources>
diff --git a/wearable/src/main/res/values-et/strings.xml b/wearable/src/main/res/values-et/strings.xml
index 7fa63df09..92b972d8f 100644
--- a/wearable/src/main/res/values-et/strings.xml
+++ b/wearable/src/main/res/values-et/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Salvestatud</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Salvestatud</string>
+    <string name="start_phone_app">Käivitage rakendus oma telefonis, et jätkata...</string>
+    <string name="add_end">Lisa seeria</string>
+    <string name="toggle_timer">Nulli taimer</string>
+    <string name="start_timer">Käivita taimer</string>
+    <string name="vibration">Värin</string>
+    <string name="sound">Heli</string>
+    <string name="today">täna</string>
+    <string name="notification_channel_default">Vaikimisi</string>
 </resources>
diff --git a/wearable/src/main/res/values-fi/strings.xml b/wearable/src/main/res/values-fi/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-fi/strings.xml
+++ b/wearable/src/main/res/values-fi/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-fr/strings.xml b/wearable/src/main/res/values-fr/strings.xml
index 18c18a149..4b9b34e53 100644
--- a/wearable/src/main/res/values-fr/strings.xml
+++ b/wearable/src/main/res/values-fr/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Enregistré</string>
-  <string name="start_phone_app">Démarrez l’application sur votre téléphone pour continuer…</string>
-  <string name="add_end">Ajouter une volée</string>
-  <string name="toggle_timer">Activer/désactiver le timer</string>
-  <string name="start_timer">Démarrer le timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Son</string>
-  <string name="today">aujourd\'hui</string>
-  <string name="notification_channel_default">Défaut</string>
+    <string name="saved">Enregistré</string>
+    <string name="start_phone_app">Démarrez l’application sur votre téléphone pour continuer…</string>
+    <string name="add_end">Ajouter une volée</string>
+    <string name="toggle_timer">Activer/désactiver le timer</string>
+    <string name="start_timer">Démarrer le timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Son</string>
+    <string name="today">aujourd\'hui</string>
+    <string name="notification_channel_default">Défaut</string>
 </resources>
diff --git a/wearable/src/main/res/values-hu/strings.xml b/wearable/src/main/res/values-hu/strings.xml
index 3574a7edb..d243ce1da 100644
--- a/wearable/src/main/res/values-hu/strings.xml
+++ b/wearable/src/main/res/values-hu/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Mentve</string>
-  <string name="start_phone_app">A folytatáshoz a fő eszközön is indítsd el a MyTargets-t</string>
-  <string name="add_end">Sorozat hozzáadása</string>
-  <string name="toggle_timer">Időzítő ki-/ bekapcsolása</string>
-  <string name="start_timer">Időzítés indítása</string>
-  <string name="vibration">Rezgés</string>
-  <string name="sound">Hang</string>
-  <string name="today">Ma</string>
-  <string name="notification_channel_default">Alapértelmezett</string>
+    <string name="saved">Mentve</string>
+    <string name="start_phone_app">A folytatáshoz a fő eszközön is indítsd el a MyTargets-t</string>
+    <string name="add_end">Sorozat hozzáadása</string>
+    <string name="toggle_timer">Időzítő ki-/ bekapcsolása</string>
+    <string name="start_timer">Időzítés indítása</string>
+    <string name="vibration">Rezgés</string>
+    <string name="sound">Hang</string>
+    <string name="today">Ma</string>
+    <string name="notification_channel_default">Alapértelmezett</string>
 </resources>
diff --git a/wearable/src/main/res/values-in/strings.xml b/wearable/src/main/res/values-in/strings.xml
index 0e25dcc8f..a3d366772 100644
--- a/wearable/src/main/res/values-in/strings.xml
+++ b/wearable/src/main/res/values-in/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Disimpan</string>
-  <string name="start_phone_app">Jalankan aplikasi di ponsel Anda untuk melanjutkan …</string>
-  <string name="add_end">Tambahkan akhir</string>
-  <string name="toggle_timer">Mengaktifkan timer</string>
-  <string name="start_timer">Mulai timer</string>
-  <string name="vibration">Getaran</string>
-  <string name="sound">Suara</string>
-  <string name="today">hari ini</string>
-  <string name="notification_channel_default">Bawaan</string>
+    <string name="saved">Disimpan</string>
+    <string name="start_phone_app">Jalankan aplikasi di ponsel Anda untuk melanjutkan …</string>
+    <string name="add_end">Tambahkan akhir</string>
+    <string name="toggle_timer">Mengaktifkan timer</string>
+    <string name="start_timer">Mulai timer</string>
+    <string name="vibration">Getaran</string>
+    <string name="sound">Suara</string>
+    <string name="today">hari ini</string>
+    <string name="notification_channel_default">Bawaan</string>
 </resources>
diff --git a/wearable/src/main/res/values-it/strings.xml b/wearable/src/main/res/values-it/strings.xml
index 935c81dba..50d5cd5b4 100644
--- a/wearable/src/main/res/values-it/strings.xml
+++ b/wearable/src/main/res/values-it/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Salvato</string>
-  <string name="start_phone_app">Avvia l\'app dal telefono per continuare…</string>
-  <string name="add_end">Aggiungi volée</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibrazione</string>
-  <string name="sound">Suono</string>
-  <string name="today">oggi</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Salvato</string>
+    <string name="start_phone_app">Avvia l\'app dal telefono per continuare…</string>
+    <string name="add_end">Aggiungi volée</string>
+    <string name="toggle_timer">Attiva/disattiva cronometro</string>
+    <string name="start_timer">Avvia cronometro</string>
+    <string name="vibration">Vibrazione</string>
+    <string name="sound">Suono</string>
+    <string name="today">oggi</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-iw/strings.xml b/wearable/src/main/res/values-iw/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-iw/strings.xml
+++ b/wearable/src/main/res/values-iw/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-ja/strings.xml b/wearable/src/main/res/values-ja/strings.xml
index 124520e31..9f203dd47 100644
--- a/wearable/src/main/res/values-ja/strings.xml
+++ b/wearable/src/main/res/values-ja/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">保存</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">保存</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-ko/strings.xml b/wearable/src/main/res/values-ko/strings.xml
index 2c33eb5e2..5d2a91e60 100644
--- a/wearable/src/main/res/values-ko/strings.xml
+++ b/wearable/src/main/res/values-ko/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">계속 하려면 귀하의 휴대 전화에 app을 시작하세요</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-nl/strings.xml b/wearable/src/main/res/values-nl/strings.xml
index 286bab4d0..8396d01d6 100644
--- a/wearable/src/main/res/values-nl/strings.xml
+++ b/wearable/src/main/res/values-nl/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Opgeslagen</string>
-  <string name="start_phone_app">Start de app op uw telefoon om verder te gaan…</string>
-  <string name="add_end">Beurt toevoegen</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Trillen</string>
-  <string name="sound">Geluid</string>
-  <string name="today">vandaag</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Opgeslagen</string>
+    <string name="start_phone_app">Start de app op uw telefoon om verder te gaan…</string>
+    <string name="add_end">Beurt toevoegen</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Trillen</string>
+    <string name="sound">Geluid</string>
+    <string name="today">vandaag</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-no/strings.xml b/wearable/src/main/res/values-no/strings.xml
index 7ca404c56..9efc3f868 100644
--- a/wearable/src/main/res/values-no/strings.xml
+++ b/wearable/src/main/res/values-no/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Lagret</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Lagret</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-pl/strings.xml b/wearable/src/main/res/values-pl/strings.xml
index 8a4d384ec..6811a2571 100644
--- a/wearable/src/main/res/values-pl/strings.xml
+++ b/wearable/src/main/res/values-pl/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Zapisano</string>
-  <string name="start_phone_app">Włącz aplikację na swoim telefonie aby kontynuować…</string>
-  <string name="add_end">Dodaj koniec</string>
-  <string name="toggle_timer">Przełącz zegar</string>
-  <string name="start_timer">Włącz zegar</string>
-  <string name="vibration">Wibracje</string>
-  <string name="sound">Dźwięk</string>
-  <string name="today">dzisiaj</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Zapisano</string>
+    <string name="start_phone_app">Włącz aplikację na swoim telefonie aby kontynuować…</string>
+    <string name="add_end">Dodaj serię</string>
+    <string name="toggle_timer">Przełącz zegar</string>
+    <string name="start_timer">Włącz zegar</string>
+    <string name="vibration">Wibracje</string>
+    <string name="sound">Dźwięk</string>
+    <string name="today">dzisiaj</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-pt-rBR/strings.xml b/wearable/src/main/res/values-pt-rBR/strings.xml
index 6ef89104e..c4f315187 100644
--- a/wearable/src/main/res/values-pt-rBR/strings.xml
+++ b/wearable/src/main/res/values-pt-rBR/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Salvo</string>
-  <string name="start_phone_app">Inicie o aplicativo em seu telefone para continuar…</string>
-  <string name="add_end">Adicionar série</string>
-  <string name="toggle_timer">Alternar cronômetro</string>
-  <string name="start_timer">Iniciar cronômetro</string>
-  <string name="vibration">Vibração</string>
-  <string name="sound">Som</string>
-  <string name="today">hoje</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Salvo</string>
+    <string name="start_phone_app">Inicie o aplicativo em seu telefone para continuar…</string>
+    <string name="add_end">Adicionar série</string>
+    <string name="toggle_timer">Alternar cronômetro</string>
+    <string name="start_timer">Iniciar cronômetro</string>
+    <string name="vibration">Vibração</string>
+    <string name="sound">Som</string>
+    <string name="today">hoje</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-pt-rPT/strings.xml b/wearable/src/main/res/values-pt-rPT/strings.xml
index ba7912e5d..e97f69b27 100644
--- a/wearable/src/main/res/values-pt-rPT/strings.xml
+++ b/wearable/src/main/res/values-pt-rPT/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Salvo</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Salvo</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-ro/strings.xml b/wearable/src/main/res/values-ro/strings.xml
index 9084bb0c6..30110f907 100644
--- a/wearable/src/main/res/values-ro/strings.xml
+++ b/wearable/src/main/res/values-ro/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Salvat</string>
-  <string name="start_phone_app">Porniţi aplicaţia pentru a continua…</string>
-  <string name="add_end">Adaugă Set</string>
-  <string name="toggle_timer">Comuta cronometru</string>
-  <string name="start_timer">Porneste cronometrul</string>
-  <string name="vibration">Vibrare</string>
-  <string name="sound">Sunet</string>
-  <string name="today">azi</string>
-  <string name="notification_channel_default">Implicit</string>
+    <string name="saved">Salvat</string>
+    <string name="start_phone_app">Porniţi aplicaţia pentru a continua…</string>
+    <string name="add_end">Adaugă Set</string>
+    <string name="toggle_timer">Comuta cronometru</string>
+    <string name="start_timer">Porneste cronometrul</string>
+    <string name="vibration">Vibrare</string>
+    <string name="sound">Sunet</string>
+    <string name="today">azi</string>
+    <string name="notification_channel_default">Implicit</string>
 </resources>
diff --git a/wearable/src/main/res/values-ru/strings.xml b/wearable/src/main/res/values-ru/strings.xml
index 0e0f63917..28d9bb5af 100644
--- a/wearable/src/main/res/values-ru/strings.xml
+++ b/wearable/src/main/res/values-ru/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Сохранено</string>
-  <string name="start_phone_app">Запустите приложение на своем телефоне, чтобы продолжить…</string>
-  <string name="add_end">Добавить серию</string>
-  <string name="toggle_timer">Сбросить таймер</string>
-  <string name="start_timer">Запустить таймер</string>
-  <string name="vibration">Вибрация</string>
-  <string name="sound">Со звуком</string>
-  <string name="today">сегодня</string>
-  <string name="notification_channel_default">По умолчанию</string>
+    <string name="saved">Сохранено</string>
+    <string name="start_phone_app">Запустите приложение на своем телефоне, чтобы продолжить…</string>
+    <string name="add_end">Добавить серию</string>
+    <string name="toggle_timer">Сбросить таймер</string>
+    <string name="start_timer">Запустить таймер</string>
+    <string name="vibration">Вибрация</string>
+    <string name="sound">Со звуком</string>
+    <string name="today">сегодня</string>
+    <string name="notification_channel_default">По умолчанию</string>
 </resources>
diff --git a/wearable/src/main/res/values-sk/strings.xml b/wearable/src/main/res/values-sk/strings.xml
index b42b7df90..4e3ce5b8d 100644
--- a/wearable/src/main/res/values-sk/strings.xml
+++ b/wearable/src/main/res/values-sk/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Uložené</string>
-  <string name="start_phone_app">Pre pokračovanie spustite na telefóne aplikáciu…</string>
-  <string name="add_end">Pridať sadu</string>
-  <string name="toggle_timer">Prepnúť časovač</string>
-  <string name="start_timer">Spustiť časovač</string>
-  <string name="vibration">Vibrovať</string>
-  <string name="sound">Zvuk</string>
-  <string name="today">dnes</string>
-  <string name="notification_channel_default">Predvolené</string>
+    <string name="saved">Uložené</string>
+    <string name="start_phone_app">Pre pokračovanie spustite na telefóne aplikáciu…</string>
+    <string name="add_end">Pridať sadu</string>
+    <string name="toggle_timer">Prepnúť časovač</string>
+    <string name="start_timer">Spustiť časovač</string>
+    <string name="vibration">Vibrovať</string>
+    <string name="sound">Zvuk</string>
+    <string name="today">dnes</string>
+    <string name="notification_channel_default">Predvolené</string>
 </resources>
diff --git a/wearable/src/main/res/values-sl/strings.xml b/wearable/src/main/res/values-sl/strings.xml
index 4568b04ba..1d38e27d6 100644
--- a/wearable/src/main/res/values-sl/strings.xml
+++ b/wearable/src/main/res/values-sl/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Shranjeno</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Shranjeno</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-sr/strings.xml b/wearable/src/main/res/values-sr/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-sr/strings.xml
+++ b/wearable/src/main/res/values-sr/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-sv/strings.xml b/wearable/src/main/res/values-sv/strings.xml
index 85a138ccb..d39f59687 100644
--- a/wearable/src/main/res/values-sv/strings.xml
+++ b/wearable/src/main/res/values-sv/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Sparad</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Sparad</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-tr/strings.xml b/wearable/src/main/res/values-tr/strings.xml
index d405a206d..3761eb19f 100644
--- a/wearable/src/main/res/values-tr/strings.xml
+++ b/wearable/src/main/res/values-tr/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Kaydedildi</string>
-  <string name="start_phone_app">Devam etmek için telefonunuzdaki uygulamayı başlatın…</string>
-  <string name="add_end">Son ekle</string>
-  <string name="toggle_timer">Zamanlayıcıyı aç / kapat</string>
-  <string name="start_timer">Zamanlayıcıyı başlat</string>
-  <string name="vibration">Titreşim</string>
-  <string name="sound">Ses</string>
-  <string name="today">bugün</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Kaydedildi</string>
+    <string name="start_phone_app">Devam etmek için telefonunuzdaki uygulamayı başlatın…</string>
+    <string name="add_end">Son ekle</string>
+    <string name="toggle_timer">Zamanlayıcıyı aç / kapat</string>
+    <string name="start_timer">Zamanlayıcıyı başlat</string>
+    <string name="vibration">Titreşim</string>
+    <string name="sound">Ses</string>
+    <string name="today">bugün</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-uk/strings.xml b/wearable/src/main/res/values-uk/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-uk/strings.xml
+++ b/wearable/src/main/res/values-uk/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-vi/strings.xml b/wearable/src/main/res/values-vi/strings.xml
index 2c33eb5e2..41ce98737 100644
--- a/wearable/src/main/res/values-vi/strings.xml
+++ b/wearable/src/main/res/values-vi/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">Saved</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-zh-rCN/strings.xml b/wearable/src/main/res/values-zh-rCN/strings.xml
index 29ec3da07..cf7f80507 100644
--- a/wearable/src/main/res/values-zh-rCN/strings.xml
+++ b/wearable/src/main/res/values-zh-rCN/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">已保存</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">已保存</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>
diff --git a/wearable/src/main/res/values-zh-rTW/strings.xml b/wearable/src/main/res/values-zh-rTW/strings.xml
index 2cefe2278..60b4993ac 100644
--- a/wearable/src/main/res/values-zh-rTW/strings.xml
+++ b/wearable/src/main/res/values-zh-rTW/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">已儲存</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+    <string name="saved">已儲存</string>
+    <string name="start_phone_app">Start the app on your phone to continue…</string>
+    <string name="add_end">Add end</string>
+    <string name="toggle_timer">Toggle timer</string>
+    <string name="start_timer">Start timer</string>
+    <string name="vibration">Vibration</string>
+    <string name="sound">Sound</string>
+    <string name="today">today</string>
+    <string name="notification_channel_default">Default</string>
 </resources>