Optimize onboarding screen to fit on screens and improve texts (fixes #126) (fixes #192) (#196)

* Update desc_padding to 20dp

* Update dimens

* Update welcome wizard texts

* Remove unused dimen

* Update welcome slide layouts

* Add dimen: grant_button_padding

* Welcome slides: use dimen/dots_height as marginBottom

* Update ic_location

* Add @dimen/welcome_title

* Remove res-auto/autoSizeTextType

Add @dimen/slide_desc

* Add dimen for 540dp TV displays

* Add FirstStartActivity#isRunningOnTV detection

* Updated translations

* Increase default slide_desc textSize to 16sp (fixes #126)

* Add dimens for devics with at least 320dp

* Update dimens defintions

* Detect missing "ignore doze" dialog on Android TV's (fixes #192)

app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java

@@ -3,11 +3,14 @@ package com.nutomic.syncthingandroid.activities;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.UiModeManager;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.Manifest;
 import android.net.Uri;
@@ -85,6 +88,8 @@ public class FirstStartActivity extends Activity {
     @Inject
     SharedPreferences mPreferences;
 
+    private Boolean mRunningOnTV = false;
+
     /**
      * Handles activity behaviour depending on prerequisites.
      */
@@ -94,6 +99,9 @@ public class FirstStartActivity extends Activity {
         super.onCreate(savedInstanceState);
         ((SyncthingApp) getApplication()).component().inject(this);
 
+        mRunningOnTV = isRunningOnTV();
+        Log.d(TAG, mRunningOnTV ? "Running on a TV Device" : "Running on a non-TV Device");
+
         /**
          * Check if a valid config exists that can be read and parsed.
          */
@@ -231,7 +239,14 @@ public class FirstStartActivity extends Activity {
             if (!haveIgnoreDozePermission()) {
                 Toast.makeText(this, R.string.toast_ignore_doze_permission_required,
                         Toast.LENGTH_LONG).show();
-                return;
+                /**
+                 * a) Phones, tablets: The ignore doze permission is mandatory.
+                 * b) TVs: The ignore doze permission is optional as it can only set by ADB on Android 8+.
+                 */
+                if (!mRunningOnTV) {
+                    // Case a) - Prevent user moving on with the slides.
+                    return;
+                }
             }
         }
 
@@ -241,14 +256,14 @@ public class FirstStartActivity extends Activity {
             mViewPager.setCurrentItem(current);
             mBackButton.setVisibility(View.VISIBLE);
             if (current == mSlidePosIgnoreDozePermission) {
-                if ("NVIDIA".equalsIgnoreCase(Build.MANUFACTURER)) {
+                if (mRunningOnTV) {
-                    if (Util.containsIgnoreCase(Build.MODEL, "Android TV")) {
+                    /**
-                        /**
+                     * Display workaround notice: Without workaround SyncthingNative can't run reliably on TV's running Android 8+.
-                         * Display workaround notice: Without workaround SyncthingNative can't run on this OS reliably.
+                     * See issue https://github.com/Catfriend1/syncthing-android/issues/192
-                         * See issue https://github.com/Catfriend1/syncthing-android/issues/192
+                     */
-                         */
+                    TextView ignoreDozeOsNotice = (TextView) findViewById(R.id.tvIgnoreDozePermissionOsNotice);
-                        ((TextView) findViewById(R.id.tvIgnoreDozePermissionOsNotice)).setVisibility(View.VISIBLE);
+                    ignoreDozeOsNotice.setText(getString(R.string.ignore_doze_permission_os_notice, getString(R.string.wiki_url), "Android-TV-preparations"));
-                    }
+                    ignoreDozeOsNotice.setVisibility(View.VISIBLE);
                 }
             }
             else if (current == mSlidePosKeyGeneration) {
@@ -417,14 +432,29 @@ public class FirstStartActivity extends Activity {
     @SuppressLint("InlinedApi")
     @TargetApi(23)
     private void requestIgnoreDozePermission() {
+        Boolean intentFailed = false;
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + getPackageName()));
         try {
-            startActivity(intent);
+            ComponentName componentName = intent.resolveActivity(getPackageManager());
+            if (componentName != null) {
+                String className = componentName.getClassName();
+                if (className != null && !className.equalsIgnoreCase("com.android.tv.settings.EmptyStubActivity")) {
+                    // Launch "Exempt from doze mode?" dialog.
+                    startActivity(intent);
+                    return;
+                }
+                intentFailed = true;
+            } else {
+                Log.w(TAG, "Request ignore battery optimizations not supported");
+                intentFailed = true;
+            }
         } catch (ActivityNotFoundException e) {
-            // Some devices dont seem to support this request (according to Google Play
-            // crash reports).
             Log.w(TAG, "Request ignore battery optimizations not supported", e);
+            intentFailed = true;
+        }
+        if (intentFailed) {
+            // Some devices don't support this request.
             Toast.makeText(this, R.string.dialog_disable_battery_optimizations_not_supported, Toast.LENGTH_LONG).show();
         }
     }
@@ -548,4 +578,8 @@ public class FirstStartActivity extends Activity {
         }
     }
 
+    private Boolean isRunningOnTV() {
+        UiModeManager uiModeManager = (UiModeManager) getSystemService(UI_MODE_SERVICE);
+        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
+    }
 }

app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml

@@ -5,26 +5,40 @@
     android:background="@color/bg_screen5">
 
     <LinearLayout
-        android:background="@color/bg_screen5"
-        android:gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:background="@color/bg_screen5"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title"
+            android:id="@+id/welcome_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
+            android:textSize="@dimen/welcome_title" />
-            android:layout_margin="30dp" />
+
+        <TextView
+            android:id="@+id/slide_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
+            android:text="@string/ignore_doze_permission_title"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_title"
+            android:textStyle="bold"/>
 
         <ImageView
-            android:layout_width="@dimen/img_width_height"
+            android:layout_width="58dp"
-            android:layout_height="@dimen/img_width_height"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
             android:contentDescription="@null"
             android:src="@drawable/ic_battery_lightning" />
 
@@ -33,28 +47,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:paddingEnd="40dp"
-            android:paddingLeft="40dp"
-            android:paddingRight="40dp"
-            android:paddingStart="40dp"
-            android:text="@string/grant_permission"
             android:contentDescription="@string/grant_permission"
-            android:drawableLeft="@android:drawable/ic_menu_manage"
             android:drawableStart="@android:drawable/ic_menu_manage"
+            android:drawableLeft="@android:drawable/ic_menu_manage"
+            android:paddingStart="@dimen/grant_button_padding"
+            android:paddingLeft="@dimen/grant_button_padding"
+            android:paddingEnd="@dimen/grant_button_padding"
+            android:paddingRight="@dimen/grant_button_padding"
+            android:text="@string/grant_permission"
             android:textSize="12sp" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/ignore_doze_permission_title"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
-
         <TextView
             android:id="@+id/tvIgnoreDozePermissionOsNotice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:justificationMode="inter_word"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/ignore_doze_permission_os_notice"
@@ -66,7 +74,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="@dimen/dots_height"
+            android:justificationMode="inter_word"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/ignore_doze_permission_desc"

app/src/main/res/layout/activity_firststart_intro.xml

@@ -5,41 +5,64 @@
     android:background="@color/bg_screen1">
 
     <LinearLayout
-        android:background="@color/bg_screen1"
-        android:gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:background="@color/bg_screen1"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title"
+            android:id="@+id/welcome_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
+            android:textSize="@dimen/welcome_title" />
-            android:layout_margin="30dp" />
 
-        <ImageView
+        <RelativeLayout
-            android:layout_width="@dimen/img_width_height"
+            android:id="@+id/inner"
-            android:layout_height="@dimen/img_width_height"
+            android:layout_width="wrap_content"
-            android:contentDescription="@null"
+            android:layout_height="match_parent"
-            android:src="@drawable/ic_syncthing_logo" />
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:layout_gravity="center">
+
+            <ImageView
+                android:id="@+id/ivIcon"
+                android:layout_width="59dp"
+                android:layout_height="61dp"
+                android:layout_marginTop="5dp"
+                android:contentDescription="@null"
+                android:src="@drawable/ic_syncthing_logo" />
+
+            <TextView
+                android:id="@+id/slide_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="8dp"
+                android:layout_toEndOf="@+id/ivIcon"
+                android:layout_toRightOf="@+id/ivIcon"
+                android:text="@string/introduction"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_title"
+                android:textStyle="bold"/>
+
+        </RelativeLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/introduction"
+            android:layout_marginTop="5dp"
-            android:textColor="@android:color/white"
+            android:layout_marginBottom="@dimen/dots_height"
-            android:textSize="@dimen/slide_title"
+            android:justificationMode="inter_word"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/welcome_text"

app/src/main/res/layout/activity_firststart_key_generation.xml

@@ -5,42 +5,49 @@
     android:background="@color/bg_screen4">
 
     <LinearLayout
-        android:background="@color/bg_screen4"
-        android:gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:background="@color/bg_screen4"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title"
+            android:id="@+id/welcome_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
+            android:textSize="@dimen/welcome_title" />
-            android:layout_margin="30dp" />
-
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_secure_key" />
 
         <TextView
+            android:id="@+id/slide_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
             android:text="@string/key_generation_title"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
+
+        <ImageView
+            android:layout_width="113dp"
+            android:layout_height="93dp"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_secure_key" />
 
         <TextView
             android:id="@+id/key_generation_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
+            android:layout_marginBottom="@dimen/dots_height"
+            android:justificationMode="inter_word"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/web_gui_creating_key"

app/src/main/res/layout/activity_firststart_location_permission.xml

@@ -5,56 +5,78 @@
     android:background="@color/bg_screen3">
 
     <LinearLayout
-        android:background="@color/bg_screen3"
-        android:gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:background="@color/bg_screen3"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title"
+            android:id="@+id/welcome_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
+            android:maxLines="1"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
+            android:textSize="@dimen/welcome_title" />
-            android:layout_margin="30dp" />
-
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_location" />
-
-        <Button
-            android:id="@+id/btnGrantLocationPerm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:paddingEnd="40dp"
-            android:paddingLeft="40dp"
-            android:paddingRight="40dp"
-            android:paddingStart="40dp"
-            android:text="@string/grant_permission"
-            android:contentDescription="@string/grant_permission"
-            android:drawableLeft="@android:drawable/ic_menu_mylocation"
-            android:drawableStart="@android:drawable/ic_menu_mylocation"
-            android:textSize="12sp" />
 
         <TextView
+            android:id="@+id/slide_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
             android:text="@string/location_permission_title"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
+
+        <RelativeLayout
+            android:id="@+id/inner"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding">
+
+            <ImageView
+                android:id="@+id/ivIcon"
+                android:layout_width="87dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="5dp"
+                android:contentDescription="@null"
+                android:src="@drawable/ic_location" />
+
+            <Button
+                android:id="@+id/btnGrantLocationPerm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@+id/ivIcon"
+                android:layout_toRightOf="@+id/ivIcon"
+                android:contentDescription="@string/grant_permission"
+                android:drawableStart="@android:drawable/ic_menu_mylocation"
+                android:drawableLeft="@android:drawable/ic_menu_mylocation"
+                android:paddingStart="@dimen/grant_button_padding"
+                android:paddingLeft="@dimen/grant_button_padding"
+                android:paddingEnd="@dimen/grant_button_padding"
+                android:paddingRight="@dimen/grant_button_padding"
+                android:text="@string/grant_permission"
+                android:textSize="12sp"/>
+
+        </RelativeLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="@dimen/dots_height"
+            android:justificationMode="inter_word"
+            android:maxLines="20"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/location_permission_desc"

app/src/main/res/layout/activity_firststart_storage_permission.xml

@@ -5,26 +5,39 @@
     android:background="@color/bg_screen2">
 
     <LinearLayout
-        android:background="@color/bg_screen2"
-        android:gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:background="@color/bg_screen2"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title"
+            android:id="@+id/welcome_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
+            android:textSize="@dimen/welcome_title" />
-            android:layout_margin="30dp" />
+
+        <TextView
+            android:id="@+id/slide_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
+            android:text="@string/storage_permission_title"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_title"
+            android:textStyle="bold"/>
 
         <ImageView
-            android:layout_width="@dimen/img_width_height"
+            android:layout_width="64dp"
-            android:layout_height="@dimen/img_width_height"
+            android:layout_height="61dp"
             android:contentDescription="@null"
             android:src="@drawable/ic_storage" />
 
@@ -33,28 +46,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:paddingEnd="40dp"
-            android:paddingLeft="40dp"
-            android:paddingRight="40dp"
-            android:paddingStart="40dp"
-            android:text="@string/grant_permission"
             android:contentDescription="@string/grant_permission"
-            android:drawableLeft="@android:drawable/ic_menu_save"
             android:drawableStart="@android:drawable/ic_menu_save"
+            android:drawableLeft="@android:drawable/ic_menu_save"
+            android:paddingStart="@dimen/grant_button_padding"
+            android:paddingLeft="@dimen/grant_button_padding"
+            android:paddingEnd="@dimen/grant_button_padding"
+            android:paddingRight="@dimen/grant_button_padding"
+            android:text="@string/grant_permission"
             android:textSize="12sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/storage_permission_title"
+            android:layout_marginTop="5dp"
-            android:textColor="@android:color/white"
+            android:layout_marginBottom="@dimen/dots_height"
-            android:textSize="@dimen/slide_title"
+            android:justificationMode="inter_word"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
             android:paddingLeft="@dimen/desc_padding"
             android:paddingRight="@dimen/desc_padding"
             android:text="@string/storage_permission_desc"

app/src/main/res/values-bg/strings.xml

@@ -11,10 +11,8 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Добре дошли в Syncthing за Android</string>
 
-    <string name="welcome_text">Syncthing е приложение с отворен код, за синхронизиране на файлове.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-За да споделите информация с друго устройство е необходимо да добавите уникалния идентификатор, на даденото устройство, към списъка с устройства. След това можете да определите кои папки с кои устройства да бъдат споделени.\n\
+    <string name="ignore_doze_permission_title">Пестене на батерия</string>
-Ако срещнете проблем моля докладвайте в Github.</string>
-
     <string name="cont">Напред</string>
     <string name="generic_error">Грешка</string>
     <string name="ignore">Игнориране</string>
@@ -40,7 +38,6 @@
 
     <string name="toast_write_storage_permission_required">Приложението изисква права за записване в хранилището на данни</string>
 
-    <string name="ignore_doze_permission_title">Пестене на батерия</string>
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-ca-rES/strings.xml

@@ -14,18 +14,17 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Introducció</string>
-    <string name="welcome_text">El Syncthing és una aplicació de sincronització de fitxers de codi obert.\n\
-Per compartir dades amb altres dispositius, cal que afegiu els seus identificadors únics a la llista de dispositius. Un cop fet això podreu triar quines carpetes voleu compartir i amb quins dispositius.\n\
-Ens podeu informar dels problemes que trobeu a través de Github.</string>
-
     <!-- Slide "Storage Permission" -->
     <string name="storage_permission_title">Permís d\'emmagatzematge</string>
     <string name="storage_permission_desc">El Syncthing necessita accés a l\'emmagatzematge per poder sincronitzar els arxius</string>
 
+    <!-- Slide "Ignore battery optimizations" -->
+    <string name="ignore_doze_permission_title">Optimització de bateria</string>
+    <string name="toast_ignore_doze_permission_required">Aquesta aplicació només pot funcionar de maner fiable si està eximida del mode d\'estalvi d\'energia \"doze\"</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">El teu dispositiu no permet desactivar les optimitzacions de bateria</string>
+
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Permís d\'ubicació</string>
-    <string name="location_permission_desc">Podeu configurar el Syncthing perquè funcioni amb les xarxes Wi-Fi que seleccioneu. L\'Android requereix que les aplicacions tinguin permís d\'ubicació per poder cercar el nom de les xarxes Wi-Fi actives, ja que es podria deduir la localització de l\'usuari a partir del nom de la xarxa a la qual es troba connectat. Si voleu utilitzar aquesta característica, premeu el botó de la part superior per donar els permisos necessaris al Syncthing. Altrament podeu ometre aquest pas.</string>
-
     <!-- Slide "Key Generation" -->
     <string name="key_generation_title">Generació de Claus</string>
     <string name="key_generation_success">S\'han generat amb èxit les claus segures per a l\'intercanvi privat de dades</string>
@@ -81,11 +80,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
 
     <string name="folder_rejected">El dispositiu \"%1$s\" vol compartir la carpeta \"%2$s\"</string>
 
-    <string name="ignore_doze_permission_title">Optimització de bateria</string>
-    <string name="ignore_doze_permission_desc">Passat algun temps, l\'Android podria aturar la sincronització. Per evitar-ho, apagueu l\'optimitzador de bateria.\n\nAlguns dispositius porten pre-instal·lades aplicacions que finalitzen les tasques automàticament, en aquest cas hauríeu d\'afegir el Syncthing a la seva llista d\'aplicacions autoritzades.</string>
-    <string name="toast_ignore_doze_permission_required">Aquesta aplicació només pot funcionar de maner fiable si està eximida del mode d\'estalvi d\'energia \"doze\"</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">El teu dispositiu no permet desactivar les optimitzacions de bateria</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-cs/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Vítejte v Syncthing pro Android</string>
 
-    <string name="welcome_text">Syncthing je synchronizační aplikace s otevřeným zdrojovým kódem.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Pro sdílení dat s dalšími přístroji je třeba přidat jejich unikátní ID do seznamu. Poté lze určovat, které adresáře jsou sdíleny s kterými přístroji.\n\
+    <string name="ignore_doze_permission_title">Optimalizace využití baterie</string>
-Všechny zaznamenané chyby prosím hlašte přes Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Vaše zařízení nepodporuje vypnutí optimalizací baterie</string>
 
     <string name="cont">Pokračovat</string>
     <string name="finish">Dokončit</string>
@@ -41,10 +41,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
 
     <string name="toast_write_storage_permission_required">Tato aplikace vyžaduje oprávnění pro zápis do úložiště</string>
 
-    <string name="ignore_doze_permission_title">Optimalizace využití baterie</string>
-    <string name="ignore_doze_permission_desc">Po nějakém čase může Android zastavit synchronizaci. Aby se tak nestalo, vypněte optimalizaci využití baterie.\n\nNa některých zařízeních mohou být také předinstalovány aplikace ukončující úlohy. Měli byste přidat Syncthing do jejich výjimek.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Vaše zařízení nepodporuje vypnutí optimalizací baterie</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-da/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Velkommen til Syncthing til Android</string>
 
-    <string name="welcome_text">Syncthing er en open-source fil-synkroniserings applikation.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-For at dele data med andre enheder, skal du tilføje deres enheds unikke ID til enhedslisten. Efter dette kan du vælge hvilke mapper der skal deles med hvilke enheder.\n\
+    <string name="ignore_doze_permission_title">Batterioptimering</string>
-Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Din enhed understøtter ikke at slå batterioptimeringer fra.</string>
 
     <string name="cont">Fortsæt</string>
     <string name="finish">Færdiggør</string>
@@ -39,10 +39,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
 
     <string name="toast_write_storage_permission_required">Write storage rettigheder er nødvendige for denne app.</string>
 
-    <string name="ignore_doze_permission_title">Batterioptimering</string>
-    <string name="ignore_doze_permission_desc">Android stopper måske synkroniseringen efter noget tid. For at undgå dette, vælg batterioptimering fra.\n\nNogle enheder har ekstra job-afsluttende apps installeret. Du burde også tilføje Syncthing til deres whitelist. </string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Din enhed understøtter ikke at slå batterioptimeringer fra.</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-de/strings.xml

@@ -14,8 +14,7 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Einführung</string>
-    <string name="welcome_text">Syncthing ist eine quelloffene Software zur Datensynchronisierung.\n\
+    <string name="welcome_text">Syncthing ist eine quelloffene Software zur Dateisynchronisierung. Um Daten mit anderen Geräten zu teilen, müssen Sie deren eindeutige Geräte IDs zur Geräteliste hinzufügen. Danach können Sie festlegen, welche Ordner mit welchen Geräten geteilt werden.\n\
-Um Daten mit anderen Geräten zu teilen, müssen Sie deren eindeutige Geräte IDs zur Geräteliste hinzufügen.\n\
 Bitte melden Sie auftretende Probleme via GitHub.</string>
 
     <!-- Slide "Storage Permission" -->
@@ -23,11 +22,15 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
     <string name="storage_permission_desc">Syncthing muss auf den Speicher zugreifen können, um Dateien zu synchronisieren.</string>
 
     <!-- Slide "Ignore battery optimizations" -->
-    <string name="ignore_doze_permission_os_notice">Das aktuell installierte herstellerspezifische Android OS ist bekannt dafür, Probleme zu haben, diese App zuverlässig im Hintergrund auszuführen. Eine Lösung ist im Wiki unter https://github.com/Catfriend1/syncthing-android/wiki/nVidia-Shield-TV-preparations verfügbar . Starte diese App nach dem Durcharbeiten der Anleitung neu.</string>
+    <string name="ignore_doze_permission_title">Akku-Optimierung</string>
+    <string name="ignore_doze_permission_os_notice">Es ist bekannt, dass Android TV\'s die App gelegentlich beenden, wenn sie im Hintergrund ausgeführt wird. Eine Lösung ist im Wiki unter \'%1$s/%2$s\' verfügbar.</string>
+    <string name="ignore_doze_permission_desc">Android kann die Synchronisation nach einiger Zeit stoppen. Um dies zu verhindern, muss die Akku-Optimierung deaktiviert werden. Einige Geräte haben Apps vorinstalliert, welche Hintergrundaktivitäten unterbinden. Syncthing sollte deshalb auf deren Ausnahmeliste hinzugefügt werden.</string>
+    <string name="toast_ignore_doze_permission_required">Diese App funktioniert nur dann zuverlässig, wenn Sie vom \"Doze\" Energiesparmodus ausgenommen wird.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Dein Gerät unterstützt das deaktivieren der Batterielaufzeit Optimierung nicht</string>
 
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Standort-Berechtigung</string>
-    <string name="location_permission_desc">Syncthing kann eingestellt werden, nur in bestimmten WLAN-Netzwerken zu laufen. Android erfordert, dass Apps die Standortberechtigung haben müssen, um den Namen des gerade verbundenen WLAN-Netzwerks ermitteln zu können, da diese potentiell den Standort des Nutzers aus dem Namen des Netzwerks ableiten können. Wenn du diese Funktion nutzen möchtest, klicke die Schaltfläche, um Syncthing die dafür benötigte Berechtigung zu erteilen. Andernfalls kannst du diesen Schritt auslassen.</string>
+    <string name="location_permission_desc">Syncthing kann eingestellt werden, in bestimmten WLAN-Netzwerken zu arbeiten. Android erfordert, dass die App über die Standortberechtigung verfügt, um den Namen des aktiven Wi-Fi-Netzwerks auszulesen. Wenn Sie diese Funktion verwenden möchten, betätigen Sie die Schaltfläche oben. Sie können diesen Schritt überspringen. Weitere Informationen finden Sie in unserer Datenschutzerklärung.</string>
 
     <!-- Slide "Key Generation" -->
     <string name="key_generation_title">Schlüssel-Erstellung</string>
@@ -84,11 +87,6 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
 
     <string name="folder_rejected">Gerät \"%1$s\" möchte Verzeichnis \"%2$s\" teilen</string>
 
-    <string name="ignore_doze_permission_title">Batterielaufzeit Optimierung</string>
-    <string name="ignore_doze_permission_desc">Android kann die Synchronisation nach einiger Zeit stoppen. Um dies zu verhindern, muss der Energiesparmodus \"Doze\" deaktiviert werden.\n\nEinige Geräte haben Apps vorinstalliert, welche Hintergrundaktivitäten unterbinden. Syncthing sollte deshalb auch dort in die Ausnahmeliste hinzugefügt werden.</string>
-    <string name="toast_ignore_doze_permission_required">Diese App funktioniert nur dann zuverlässig, wenn Sie vom \"Doze\" Energiesparmodus ausgenommen wird.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Dein Gerät unterstützt das deaktivieren der Batterielaufzeit Optimierung nicht</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-el/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Καλώς ορίσατε στο Syncthing για Android</string>
 
-    <string name="welcome_text">Το Syncthing είναι μια ανοιχτού κώδικα εφαρμογή συγχρονισμού αρχείων.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Για να μοιραστείτε δεδομένα με άλλες συσκευές, πρέπει να προσθέσετε τα μοναδικά αναγνωριστικά τους στη λίστα συσκευών. Μετά μπορείτε να επιλέξετε ποίοι φάκελοι θα διαμοιραστούν με ποιες συσκευές.\n\
+    <string name="ignore_doze_permission_title">Βελτιστοποίηση μπαταρίας</string>
-Παρακαλώ αναφέρετε τυχόν προβλήματα που αντιμετωπίσετε μέσω του Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Η συσκευή σας δεν επιτρέπει την απενεργοποίηση των βελτιστοποιήσεων μπαταρίας</string>
 
     <string name="cont">Συνέχεια</string>
     <string name="finish">Τέλος</string>
@@ -39,10 +39,6 @@
 
     <string name="toast_write_storage_permission_required">Απαιτείται η άδεια αποθήκευσης δεδομένων για αυτή την εφαρμογή</string>
 
-    <string name="ignore_doze_permission_title">Βελτιστοποίηση μπαταρίας</string>
-    <string name="ignore_doze_permission_desc">Το Android ενδέχεται να σταματήσει τον συγχρονισμό μετά από κάποιο χρονικό διάστημα. Για να αποφευχθεί αυτό, απενεργοποιήστε τη βελτιστοποίηση μπαταρίας.\n\nΚάποιες συσκευές διαθέτουν επίσης προεγκατεστημένες εφαρμογές τερματισμού διεργασιών. Προσθέστε το Syncthing στο whitelist τους.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Η συσκευή σας δεν επιτρέπει την απενεργοποίηση των βελτιστοποιήσεων μπαταρίας</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-es/strings.xml

@@ -11,8 +11,8 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Bienvenido a Syncthing para Android</string>
 
-    <string name="welcome_text">Syncthing es una aplicación para sincronización de ficheros de fuentes abiertas.\nPara compartir datos con otros dispisitivos, necesitas añadir sus identificadores únicos de dispositivo a la lista de dispositivos. Después, puedes seleccionar qué carpetas vas a compartir con qué dispositivos.\nPor favor, informa de cualquier problema que te encuentres vía Github.</string>
+    <!-- Slide "Ignore battery optimizations" -->
-
+    <string name="ignore_doze_permission_title">Optimización de batería</string>
     <string name="cont">Continuar</string>
     <string name="finish">Finalizar</string>
     <string name="generic_error">Error</string>
@@ -37,8 +37,6 @@
 
     <string name="toast_write_storage_permission_required">Esta app necesita permiso para escribir al sistema de almacenamiento</string>
 
-    <string name="ignore_doze_permission_title">Optimización de batería</string>
-    <string name="ignore_doze_permission_desc">Andoid puede detener la sincronización pasado un tiempo. Para evitarlo, deshabilita la optimización de batería.\n\nAlgunos dispositivos tienen instaladas aplicaciones adicionales para terminar tareas. Igualmente, deberías añadir Syncthing a su lista blanca.</string>
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-fi/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Tervetuloa Syncthingiin Androidille</string>
 
-    <string name="welcome_text">Syncthing on avoimen lähdekoodin tiedostojensynkronointisovellus.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Jakaaksesi tietoa toisten laitteiden kanssa, sinun tarvitsee lisätä niiden yksilölliset laitetunnukset laiteluetteloon. Myöhemmin voit valita, mitkä kansiot jaetaan minkä laitteiden kanssa.\n\
+    <string name="ignore_doze_permission_title">Akun käytön optimointi</string>
-Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Laitteesi ei tue akun käytön optimoinnin poistamista käytöstä</string>
 
     <string name="cont">Jatka</string>
     <string name="finish">Valmis</string>
@@ -40,10 +40,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
 
     <string name="toast_write_storage_permission_required">Tämä sovellus vaatii tallennustilan kirjoitusoikeuden</string>
 
-    <string name="ignore_doze_permission_title">Akun käytön optimointi</string>
-    <string name="ignore_doze_permission_desc">Android saattaa pysäyttää synkronoinnin jonkin ajan kuluttua. Tämän estämiseksi, poista käytöstä akun käytön optimointi.\n\nJoissain laitteissa on lisäksi prosessienhallintasovelluksia valmiiksi asennettuna. Sinun tulisi lisätä Syncthing myös niiden sallittujen sovellusten listalle.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Laitteesi ei tue akun käytön optimoinnin poistamista käytöstä</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-fr/strings.xml

@@ -14,9 +14,9 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Introduction</string>
-    <string name="welcome_text">Syncthing est une application de synchronisation de fichiers. Son code source est ouvert.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Pour partager des données avec d\'autres appareils, vous devez ajouter leur identifiant unique à la liste des appareils. Ensuite, vous pouvez sélectionner quels répertoires partager avec quels appareils..\n\
+    <string name="ignore_doze_permission_title">Optimisation de la batterie</string>
-S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Votre appareil ne prend pas en charge la désactivation des optimisations de la batterie.</string>
 
     <string name="cont">Continuer</string>
     <string name="finish">Terminé</string>
@@ -45,10 +45,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
 
     <string name="toast_write_storage_permission_required">La permission d\'écriture sur l\'espace de stockage est requise pour cette application.</string>
 
-    <string name="ignore_doze_permission_title">Optimisation de la batterie</string>
-    <string name="ignore_doze_permission_desc">Android peut arrêter la synchronisation après un certain temps.  Pour éviter cela, désactivez l\'optimisation de la batterie.\n\nCertains appareils disposent d\'applications préinstallées pour tuer les tâches.  Vous devrez ajouter Syncthing à leur liste blanche.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Votre appareil ne prend pas en charge la désactivation des optimisations de la batterie.</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-hu/strings.xml

@@ -11,11 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Üdvözöl az androidos Syncthing.</string>
 
-    <string name="welcome_text">A Syncthing egy nyílt forráskódú fájlszinkronizáló alkalmazás.
+    <!-- Slide "Ignore battery optimizations" -->
-
+    <string name="ignore_doze_permission_title">Akkumulátor optimalizáció</string>
-Az adatok más eszközökkel való megosztásához hozzá kell adnod egyedi eszközazonosítójukat az eszközlistához. Utána kiválaszthatod, hogy mely mappákat mely eszközökkel osztasz meg.
+    <string name="dialog_disable_battery_optimizations_not_supported">Az eszközöd nem támogatja az akkumulátor optimalizálás letiltását</string>
-
-Kérlek, hogy az esetlegesen felmerülő hibákat jelentsd be a GitHub-on.</string>
 
     <string name="cont">Folytatás</string>
     <string name="finish">Befejezés</string>
@@ -44,12 +42,6 @@ Az összesített statisztika nyilvánosan elérhető a https://data.syncthing.ne
 
     <string name="toast_write_storage_permission_required">Az alkalmazás használatához háttértár-hozzáférési jogra van szükség</string>
 
-    <string name="ignore_doze_permission_title">Akkumulátor optimalizáció</string>
-    <string name="ignore_doze_permission_desc">Az Android idővel leállíthatja a szinkronizálást. Ennek megakadályozásához kapcsold ki az akkumulátor optimalizálást.
-
-Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a gyártó. Ezekben szintén érdemes a Syncthinget fehérlistára tenni.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Az eszközöd nem támogatja az akkumulátor optimalizálás letiltását</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-in/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Selamat Datang di Syncthing untuk Android</string>
 
-    <string name="welcome_text">Syncthing adalah aplikasi penyelarasan berkas bebas-terbuka.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Untuk berbagi data dengan perangkat lain, anda perlu menambah ID masing-masing perangkat tersebut pada daftar perangkat. Setelah itu anda bisa memilih folder mana yang akan berbagi dengan perangkat mana.\n\
+    <string name="ignore_doze_permission_title">Optimisasi Baterai</string>
-Jika ada masalah silakan laporkan lewat Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Perangkat anda tidak mendukung untuk mematikan optimisasi baterai</string>
 
     <string name="cont">Lanjutkan</string>
     <!-- Title of the "add folder" menu action -->
@@ -37,10 +37,6 @@ Jika ada masalah silakan laporkan lewat Github.</string>
 
     <string name="toast_write_storage_permission_required">Aplikasi ini membutuuhkan kewenangan penulisan storage.</string>
 
-    <string name="ignore_doze_permission_title">Optimisasi Baterai</string>
-    <string name="ignore_doze_permission_desc">Android mungkin akan menghentikan penyelarasan setelah beberapa waktu. Untuk mencegah hal ini, matikan optimisasi baterai.\n\nBeberapa perangkat mungkin sudah memiliki aplikasi penghentian tugas. Anda juga perlu memasukkan Syncthing pada whitelist aplikasi tersebut.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Perangkat anda tidak mendukung untuk mematikan optimisasi baterai</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-it/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Benvenuto in Syncthing per Android</string>
 
-    <string name="welcome_text">Syncthing è un\'applicazione open-source di sincronizzazione file.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Per condividere i dati con altri dispositivi, è necessario aggiungere il rispettivo ID Dispositivo nell\'elenco dei dispositivi. Successivamente è possibile selezionare quali cartelle condividere con quali dispositivi.\n\
+    <string name="ignore_doze_permission_title">Ottimizzazione della batteria</string>
-Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Il tuo dispositivo non supporta la disabilitazione delle ottimizzazioni della batteria</string>
 
     <string name="cont">Continua</string>
     <string name="finish">Completato</string>
@@ -42,10 +42,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
 
     <string name="toast_write_storage_permission_required">E\' richiesto il permesso di scrittura per questa app</string>
 
-    <string name="ignore_doze_permission_title">Ottimizzazione della batteria</string>
-    <string name="ignore_doze_permission_desc">Android potrebbe interrompere la sincronizzazione dopo qualche tempo. Per evitare questo, spegnere l\'ottimizzazione della batteria.\n\nAlcuni dispositivi hanno ulteriori applicazioni preinstallate di inturruzione dei processi. Si dovrebbe aggiungere Syncthing alla loro whitelist.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Il tuo dispositivo non supporta la disabilitazione delle ottimizzazioni della batteria</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-ja/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Syncthing for Android にようこそ</string>
 
-    <string name="welcome_text">Syncthing は、オープンソースのファイル同期アプリケーションです。\n\
+    <!-- Slide "Ignore battery optimizations" -->
-他のデバイスとデータを共有するには、デバイスリストにその一意のデバイス ID を追加する必要があります。その後で、そのデバイスと共有するフォルダーを選択することができます。\n\
+    <string name="ignore_doze_permission_title">バッテリー最適化</string>
-発生した問題は何でも Github で報告してください。</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">お使いのデバイスはバッテリーの最適化を無効にできません</string>
 
     <string name="cont">続行</string>
     <string name="finish">完了</string>
@@ -41,10 +41,6 @@
 
     <string name="toast_write_storage_permission_required">このアプリはストレージの書き込みアクセス許可が必要です</string>
 
-    <string name="ignore_doze_permission_title">バッテリー最適化</string>
-    <string name="ignore_doze_permission_desc">Android はしばらくすると同期を停止することがあります。 これを防ぐには、バッテリーの最適化をオフにしてください。\n\n一部のデバイスには、タスク終了アプリが別途プリインストールされています。 これらのホワイトリストにも Syncthing を追加する必要があります。</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">お使いのデバイスはバッテリーの最適化を無効にできません</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-ko/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Android용 Syncthing에 어서오세요</string>
 
-    <string name="welcome_text">Syncthing은 오픈소스 파일 동기화 어플리케이션입니다.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-다른 장치들과 데이터를 공유하기 위해서는 기기 목록에 고유 기기 ID를 추가해야 합니다. 그 후에 기기와 공유하는 폴더를 선택할 수 있습니다.\n\
+    <string name="ignore_doze_permission_title">배터리 최적화</string>
-발생한 문제는 무엇이든 Github를 통해 알려주시기 바랍니다.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">기기가 배터리 최적화 비활성화를 지원하지 않습니다.</string>
 
     <string name="cont">계속</string>
     <string name="finish">완료</string>
@@ -39,10 +39,6 @@
 
     <string name="toast_write_storage_permission_required">스토리지 쓰기 권한이 필요합니다</string>
 
-    <string name="ignore_doze_permission_title">배터리 최적화</string>
-    <string name="ignore_doze_permission_desc">안드로이드 운영체제는 시간이 지나면 동기화를 정지시킬 수도 있습니다. 이를 막기 위해 배터리 최적화 기능을 꺼주시기 바랍니다.\n\n몇몇 기기들은 추가적인 태스크 관리 앱이 선탑재되어 있습니다. 태스크 관리 앱의 신뢰목록에 등록함으로써 역시 문제를 해결하실 수 있습니다.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">기기가 배터리 최적화 비활성화를 지원하지 않습니다.</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-nl/strings.xml

@@ -14,14 +14,14 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Introductie</string>
-    <string name="welcome_text">Syncthing is een open-bron-bestandssynchronisatietoepassing.\n\
-Om gegevens met andere apparaten te delen moet je hun unieke apparaat-ID toevoegen aan de lijst met apparaten. Daarna kan je kiezen welke mappen je met welke apparaten wilt delen.\n\
-Als je problemen tegenkomt, meld ze dan via GitHub.</string>
-
     <!-- Slide "Storage Permission" -->
     <string name="storage_permission_title">Opslagmachtiging</string>
     <string name="storage_permission_desc">Synchting heeft toegang nodig tot je bestanden om ze te kunnen synchroniseren.</string>
 
+    <!-- Slide "Ignore battery optimizations" -->
+    <string name="ignore_doze_permission_title">Batterijoptimalisatie</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Je apparaat biedt geen ondersteuning voor het uitschakelen van batterijoptimalisatie</string>
+
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Locatiemachtiging</string>
     <!-- Slide "Key Generation" -->
@@ -64,10 +64,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
 
     <string name="toast_write_storage_permission_required">Schrijftoegang is vereist voor deze applicatie</string>
 
-    <string name="ignore_doze_permission_title">Batterijoptimalisatie</string>
-    <string name="ignore_doze_permission_desc">Android kan je synchronisatie na een tijdje stoppen. Om dit te voorkomen kan je batterijoptimalisatie uitschakelen\n\nOp sommige apparaten staan extra apps voor beëindigen van taken, voeg Syncthing ook aan hun witte lijsten toe.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Je apparaat biedt geen ondersteuning voor het uitschakelen van batterijoptimalisatie</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-pl/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Witamy w Syncthing dla systemu Android</string>
 
-    <string name="welcome_text">Syncthing jest programem do synchronizacji plików o otwartych źródłach.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Aby udostępnić dane innemu urządzeniu, należy dodać jego unikalny identyfikator do listy urządzeń. Następnie wymagane jest wskazanie katalogów udostępnianych urządzeniu.\n\
+    <string name="ignore_doze_permission_title">Optymalizacja akumulatora</string>
-Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Twoje urządzenie nie wspiera wyłączania optymalizacji baterii</string>
 
     <string name="cont">Kontynuuj</string>
     <string name="finish">Koniec</string>
@@ -41,10 +41,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
 
     <string name="toast_write_storage_permission_required">Wymagane zezwolenie na zapisywanie do pamięci zewnętrznej</string>
 
-    <string name="ignore_doze_permission_title">Optymalizacja akumulatora</string>
-    <string name="ignore_doze_permission_desc">Android może wstrzymać synchronizację po pewnym czasie. By temu zapobiedz, wyłącz optymalizację baterii.\n\nNiektóre urządzenia posiadają dodatkowe preinstalowane aplikacje zatrzymujące zadania - dobrze byłoby dopisać Syncthing do listy ich wyjątków.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Twoje urządzenie nie wspiera wyłączania optymalizacji baterii</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-pt-rBR/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Bem vindo(a) ao Syncthing for Android</string>
 
-    <string name="welcome_text">O Syncthing é uma aplicação de código aberto para sincronização de arquivos.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Para compartilhar dados com outros dispositivos, você precisa adicionar seus identificadores únicos à sua lista de dispositivos. Assim você pode selecionar quais pastas compartilhará\n\
+    <string name="ignore_doze_permission_title">Otimização de bateria</string>
-Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Seu dispositivo não suporta a desativação das otimizações de bateria</string>
 
     <string name="cont">Continuar</string>
     <string name="finish">Finalizar</string>
@@ -42,10 +42,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
 
     <string name="toast_write_storage_permission_required">A permissão de escrita em armazenamento é obrigatória para este aplicativo</string>
 
-    <string name="ignore_doze_permission_title">Otimização de bateria</string>
-    <string name="ignore_doze_permission_desc">O Android poder parar a sincronização após algum tempo. Para evitar isto, desabilite a otimização de bateria.\n\nAlguns dispositivos possuem  aplicativos para \"matar\" tarefas. Você também deve adicionar o Syncthing às listas brancas deles.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Seu dispositivo não suporta a desativação das otimizações de bateria</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-pt/strings.xml

@@ -11,10 +11,8 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Bem vindo(a) ao Syncthing para Android</string>
 
-    <string name="welcome_text">O Syncthing é uma aplicação de sincronização de ficheiros de código aberto.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Para partilhar dados com outros dispositivos, tem que adicionar o seu ID único de dispositivo à lista de dispositivos. Depois pode seleccionar quais as pastas a partilhar com os dispositivos.\n\
+    <string name="ignore_doze_permission_title">Optimização da bateria</string>
-Reporte, através do Github, quaisquer problemas que encontre, por favor.</string>
-
     <string name="cont">Continuar</string>
     <string name="generic_example">Exemplo</string>
     <string name="generic_error">Erro</string>
@@ -39,8 +37,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
 
     <string name="toast_write_storage_permission_required">Esta aplicação precisa de permissão de escrita no armazenamento</string>
 
-    <string name="ignore_doze_permission_title">Optimização da bateria</string>
-    <string name="ignore_doze_permission_desc">O Android pode parar a sincronização passado algum tempo. Para prevenir isso, desligue a optimização da bateria.\n\nAlguns dispositivos têm aplicações adicionais pré-instaladas para matar tarefas. Deve adicionar o Syncthing à lista de excepções dessas aplicações.</string>
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-ro/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Bine ați venit la Syncthing pentru Android!</string>
 
-    <string name="welcome_text">Syncthing este o aplicație, cu sursă deschisă, de sincronizare a fișierelor.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Pentru a partaja date cu alte dispozitive, trebuie să le adăugați ID-ul unic de dispozitiv la lista dumneavoastră de dispozitive. După aceea puteți selecta care directoare le veți partaja cu care dispozitive.\n\
+    <string name="ignore_doze_permission_title">Optimizare baterie</string>
-Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Dispozitivul dumneavoastră nu suportă dezactivarea optimizărilor de baterie</string>
 
     <string name="cont">Continuare</string>
     <string name="finish">Terminat</string>
@@ -48,10 +48,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
 
     <string name="folder_rejected">Dispozitivul \"%1$s\" dorește să partajeze directorul \"%2$s\"</string>
 
-    <string name="ignore_doze_permission_title">Optimizare baterie</string>
-    <string name="ignore_doze_permission_desc">Android poate oprii sincronizarea după un timp. Pentru a prevenii asta, opriți optimizarea bateriei.\n\nUnele dispozitive au aplicații adiționale preinstalate care pot oprii aplicațiile. Ar trebui să adăugați Syncthing și în listele lor de excepții.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Dispozitivul dumneavoastră nu suportă dezactivarea optimizărilor de baterie</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-ru/strings.xml

@@ -14,18 +14,16 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Вступление</string>
-    <string name="welcome_text">Syncthing - это приложение с открытым исходным кодом для синхронизации файлов.\n
-Для того чтобы синхронизировать данные с другими устройствами, вам необходимо добавить их уникальные идентификаторы в список устройств. Затем вы сможете выбрать, какие папки с какими устройствами синхронизировать.\n
-Пожалуйста, сообщайте о возникших проблемах через Github.</string>
-
     <!-- Slide "Storage Permission" -->
     <string name="storage_permission_title">Доступ к файлам</string>
     <string name="storage_permission_desc">Syncthing требуется доступ к вашим файлам для осуществления синхронизации.</string>
 
+    <!-- Slide "Ignore battery optimizations" -->
+    <string name="ignore_doze_permission_title">Оптимизация батареи</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Ваше устройство не поддерживает отключение энергосбережения</string>
+
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Доступ к местоположению</string>
-    <string name="location_permission_desc">Syncthing может быть настроен работать только на выбранных Wi-Fi сетях. Android требует, чтобы приложения имели доступ к местоположению, чтобы узнать имя активной Wi-Fi сети, так как вы иногда можете узнать местоположение пользователя по имени сети, к которой он подключён. Если вы хотите использовать эту функцию, нажмите кнопку вверху, чтобы предоставить Syncthing необходимые разрешения. В противном случае вы можете пропустить этот шаг.</string>
-
     <!-- Slide "Key Generation" -->
     <string name="key_generation_title">Генерация ключей</string>
     <string name="key_generation_success">Криптографические ключи для приватного обмена данными были успешно сгенерированы.</string>
@@ -79,10 +77,6 @@
 
     <string name="folder_rejected">Устройство \"%1$s\" хочет поделиться папкой \"%2$s\"</string>
 
-    <string name="ignore_doze_permission_title">Оптимизация батареи</string>
-    <string name="ignore_doze_permission_desc">Android может остановить синхронизацию через определенное время. Чтобы избежать этого, отключите энергосбережение в режиме ожидания.\n\nТакже, если на вашем устройстве установлена программа для автоматического завершения приложений, внесите Syncthing в её список исключений.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Ваше устройство не поддерживает отключение энергосбережения</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-sv/strings.xml

@@ -14,14 +14,15 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Introduktion</string>
-    <string name="welcome_text">Syncthing är en filsynkroniseringsapplikation med öppen källkod.\n\
-För att dela data med andra enheter måste du lägga till deras unika enhets-ID i enhetslistan. Efteråt kan du välja vilka mappar som ska delas med vilka enheter.\n\
-Vänligen rapportera eventuella problem du stöter på via Github.</string>
-
     <!-- Slide "Storage Permission" -->
     <string name="storage_permission_title">Lagringsbehörighet</string>
     <string name="storage_permission_desc">Syncthing behöver komma åt din lagring för att göra filsynkronisering.</string>
 
+    <!-- Slide "Ignore battery optimizations" -->
+    <string name="ignore_doze_permission_title">Batterioptimering</string>
+    <string name="toast_ignore_doze_permission_required">Den här appen fungerar bara tillförlitligt om den är undantagen från\" doze\"-energisparläge.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Din enhet har inte stöd för att inaktivera batterioptimeringar</string>
+
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Plats tillstånd</string>
     <string name="key_generation_success">Säkra nycklar för privat datautbyte har genererats.</string>
@@ -68,11 +69,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
 
     <string name="folder_rejected">Enhet \"%1$s\" vill dela mapp \"%2$s\"</string>
 
-    <string name="ignore_doze_permission_title">Batterioptimering</string>
-    <string name="ignore_doze_permission_desc">Android kan stoppa synkronisering efter en viss tid. För att förhindra detta, stäng av batterioptimering.\n\nNågra enheter har ytterligare uppgiftsdödande appar förinstallerade. Ni bör lägga till Syncthing till deras vitlista, också.</string>
-    <string name="toast_ignore_doze_permission_required">Den här appen fungerar bara tillförlitligt om den är undantagen från\" doze\"-energisparläge.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Din enhet har inte stöd för att inaktivera batterioptimeringar</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-sw540dp/dimens.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="material_divider_inset">80dp</dimen>
+
+    <dimen name="welcome_title">42sp</dimen>
+    <dimen name="slide_desc">26sp</dimen>
+</resources>

app/src/main/res/values-tr/strings.xml

@@ -11,11 +11,8 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">Android için Syncthing\'e Hoş Geldiniz</string>
 
-    <string name="welcome_text">Syncthing bir açık kaynaklı dosya eşzamanlama uygulamasıdır.\n\
+    <!-- Slide "Ignore battery optimizations" -->
-Diğer aygıtlarla veri paylaşmak için, onların eşsiz aygıt ID\'lerini aygıt listesine eklemen gerekir.
+    <string name="ignore_doze_permission_title">Batarya İyileştirme</string>
-Ardından hangi klasörlerin hangi aygıtlar ile paylaşılacağını seçebilirsin.\n\
-Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</string>
-
     <string name="cont">Devam et</string>
     <string name="generic_error">Hata</string>
     <!-- Title of the "add folder" menu action -->
@@ -39,8 +36,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
 
     <string name="toast_write_storage_permission_required">Bu uygulama için belleğe yazma yetkisi gerekmektedir.</string>
 
-    <string name="ignore_doze_permission_title">Batarya İyileştirme</string>
-    <string name="ignore_doze_permission_desc">Android, birkaç zaman sonra eşzamanlamayı durdurabilir. Bunu önlemek için batarya iyileştirmesini kapat.\n\nBazı aygıtlar ek olarak görev bitirme uygulamalarıyla yüklü gelir. Syncthing\'i onların beyaz listesine ayrıca eklemelisiniz.</string>
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-xhdpi/dimens.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="welcome_title">16sp</dimen>
+    <dimen name="slide_title">24sp</dimen>
+    <dimen name="slide_desc">18sp</dimen>
+</resources>

app/src/main/res/values-xxhdpi/dimens.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="welcome_title">22sp</dimen>
+    <dimen name="slide_title">30sp</dimen>
+    <dimen name="slide_desc">20sp</dimen>
+</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">欢迎使用 Android 版 Syncthing</string>
 
-    <string name="welcome_text">Syncthing 是一个开源的文件同步处理应用程序。
+    <!-- Slide "Ignore battery optimizations" -->
-若要与其他设备分享数据，你需要添加他们的唯一设备 ID 到设备列表。之后你就可以选择要分享哪些文件夹至该设备上。
+    <string name="ignore_doze_permission_title">电池优化</string>
-请通过 GitHub 报告任何你遇到的问题。</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">您的设备不支持禁用电池优化</string>
 
     <string name="cont">继续</string>
     <string name="finish">完成</string>
@@ -41,12 +41,6 @@
 
     <string name="toast_write_storage_permission_required">本应用需要写存储的权限</string>
 
-    <string name="ignore_doze_permission_title">电池优化</string>
-    <string name="ignore_doze_permission_desc">Android 可能会在一段时间后停止同步。为防这种情况，请关闭电池优化。
-
-有些设备预装了额外的查杀任务应用。您也应该添加 Syncthing 到他们的白名单上。</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">您的设备不支持禁用电池优化</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values-zh-rTW/strings.xml

@@ -11,9 +11,9 @@
     <!-- Title for dialog displayed on first start -->
     <string name="welcome_title">歡迎來到 Syncthing for Android</string>
 
-    <string name="welcome_text">Syncthing 是一個開放原始碼的檔案同步應用程式。\n\
+    <!-- Slide "Ignore battery optimizations" -->
-在其他裝置間分享資料，你需要加入裝置的唯一識別碼到裝置清單中。之後，你可以選擇資料夾分享給哪些裝置。\n\
+    <string name="ignore_doze_permission_title">電池最佳化</string>
-請把你遇到的問題回報到 Github 上。</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">你的裝置不支援停用電池最佳化</string>
 
     <string name="cont">繼續</string>
     <string name="finish">完成</string>
@@ -39,10 +39,6 @@
 
     <string name="toast_write_storage_permission_required">應用程式需要寫入儲存空間的權限</string>
 
-    <string name="ignore_doze_permission_title">電池最佳化</string>
-    <string name="ignore_doze_permission_desc">Android 也許會在一段時間後停止同步。為了防止這個情形，關閉電池最佳化。\n\n有些裝置會預載額外的工作清除應用程式，你也需把 Syncthing 加入白名單中。</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">你的裝置不支援停用電池最佳化</string>
-
     <!-- StateDialogActivity -->
 
 

app/src/main/res/values/dimens.xml

@@ -6,8 +6,9 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="dots_height">30dp</dimen>
     <dimen name="dots_margin_bottom">20dp</dimen>
-    <dimen name="img_width_height">120dp</dimen>
+    <dimen name="welcome_title">18sp</dimen>
-    <dimen name="slide_title">30sp</dimen>
+    <dimen name="slide_title">20sp</dimen>
     <dimen name="slide_desc">16sp</dimen>
-    <dimen name="desc_padding">40dp</dimen>
+    <dimen name="desc_padding">20dp</dimen>
+    <dimen name="grant_button_padding">40dp</dimen>
 </resources>

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

@@ -14,8 +14,7 @@
     <!-- Welcome wizard -->
     <!-- Slide "Introduction" -->
     <string name="introduction">Introduction</string>
-    <string name="welcome_text">Syncthing is an open-source file synchronization application.\n\
+    <string name="welcome_text">Syncthing is an open-source file synchronization application. To share data with other devices, you need to add their unique device IDs to the device list. Afterwards you can select which folders to share with which devices.\n\
-To share data with other devices, you need to add their unique device IDs to the device list. Afterwards you can select which folders to share with which devices.\n\
 Please report any problems you encounter via Github.</string>
 
     <!-- Slide "Storage Permission" -->
@@ -23,11 +22,15 @@ Please report any problems you encounter via Github.</string>
     <string name="storage_permission_desc">Syncthing needs to access your storage to do file synchronization.</string>
 
     <!-- Slide "Ignore battery optimizations" -->
-    <string name="ignore_doze_permission_os_notice">The currently installed manufacturer-specific Android OS is known to cause problems running this app reliably in the background. A solution is available on the wiki at https://github.com/Catfriend1/syncthing-android/wiki/nVidia-Shield-TV-preparations . After working through the instructions, restart this app.</string>
+    <string name="ignore_doze_permission_title">Battery Optimization</string>
+    <string name="ignore_doze_permission_os_notice">Android TV\'s are known to occasionally end the app when it\'s running in the background. A solution is available on the wiki at \'%1$s/%2$s\'.</string>
+    <string name="ignore_doze_permission_desc">Android may stop synchronization after some time. To prevent this, turn off battery optimization. Some devices have additional task-killing apps preinstalled. You should add Syncthing to their whitelist, as well.</string>
+    <string name="toast_ignore_doze_permission_required">This app only works reliably if it is exempted from \"doze\" power save mode.</string>
+    <string name="dialog_disable_battery_optimizations_not_supported">Your device does not support disabling battery optimizations</string>
 
     <!-- Slide "Location Permission" -->
     <string name="location_permission_title">Location Permission</string>
-    <string name="location_permission_desc">Syncthing can be configured to run on selected Wi-Fi networks. Android requires applications to have location permissions to be able look up active Wi-Fi network name, as you can sometimes infer users location from the name of the network they are connected to. If you want to use this feature, press the button above to give the required location permissions to Syncthing. Otherwise you can skip this step.</string>
+    <string name="location_permission_desc">Syncthing can be configured to work on selected Wi-Fi networks. Android requires the app to have location permission to read the active Wi-Fi network name. If you want to use this feature, press the button above. You may skip this step. See our privacy policy for more details.</string>
 
     <!-- Slide "Key Generation" -->
     <string name="key_generation_title">Key Generation</string>
@@ -84,11 +87,6 @@ Please report any problems you encounter via Github.</string>
 
     <string name="folder_rejected">Device \"%1$s\" wants to share folder \"%2$s\"</string>
 
-    <string name="ignore_doze_permission_title">Battery Optimization</string>
-    <string name="ignore_doze_permission_desc">Android may stop synchronization after some time. To prevent this, turn off battery optimization.\n\nSome devices have additional task-killing apps preinstalled. You should add Syncthing to their whitelist, as well.</string>
-    <string name="toast_ignore_doze_permission_required">This app only works reliably if it is exempted from \"doze\" power save mode.</string>
-    <string name="dialog_disable_battery_optimizations_not_supported">Your device does not support disabling battery optimizations</string>
-
     <!-- StateDialogActivity -->
 
 
@@ -572,6 +570,7 @@ Please report any problems you encounter via Github.</string>
 
     <!-- URL of the issue tracker -->
     <string name="issue_tracker_url" translatable="false">https://github.com/Catfriend1/syncthing-android/issues</string>
+    <string name="wiki_url" translatable="false">https://github.com/Catfriend1/syncthing-android/wiki</string>
 
 
     <!-- Menu item to donate -->