From 203dfc753f3c71370e12e8206ec028979aa1d325 Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Fri, 27 Apr 2018 21:57:15 +0200 Subject: [PATCH] Add UI support for delta index resets (fixes #1060) --- .../activities/SettingsActivity.java | 37 ++++++++++++++----- .../service/SyncthingRunnable.java | 14 ++++--- .../service/SyncthingService.java | 19 ++++++++-- app/src/main/res/values-bg/strings.xml | 6 +-- app/src/main/res/values-ca-rES/strings.xml | 6 +-- app/src/main/res/values-cs/strings.xml | 6 +-- app/src/main/res/values-da/strings.xml | 6 +-- app/src/main/res/values-de/strings.xml | 6 +-- app/src/main/res/values-el/strings.xml | 6 +-- app/src/main/res/values-es-rMX/strings.xml | 6 +-- app/src/main/res/values-es/strings.xml | 6 +-- app/src/main/res/values-fi/strings.xml | 6 +-- app/src/main/res/values-fr/strings.xml | 6 +-- app/src/main/res/values-hu/strings.xml | 6 +-- app/src/main/res/values-in/strings.xml | 6 +-- app/src/main/res/values-it/strings.xml | 6 +-- app/src/main/res/values-ja/strings.xml | 6 +-- app/src/main/res/values-ko/strings.xml | 6 +-- app/src/main/res/values-nb/strings.xml | 6 +-- app/src/main/res/values-nl/strings.xml | 6 +-- app/src/main/res/values-nn/strings.xml | 6 +-- app/src/main/res/values-pl/strings.xml | 6 +-- app/src/main/res/values-pt-rBR/strings.xml | 6 +-- app/src/main/res/values-pt/strings.xml | 6 +-- app/src/main/res/values-ro/strings.xml | 6 +-- app/src/main/res/values-ru/strings.xml | 6 +-- app/src/main/res/values-sk/strings.xml | 6 +-- app/src/main/res/values-sv/strings.xml | 6 +-- app/src/main/res/values-tr/strings.xml | 6 +-- app/src/main/res/values-uk/strings.xml | 4 +- app/src/main/res/values-vi/strings.xml | 6 +-- app/src/main/res/values-zh-rCN/strings.xml | 6 +-- app/src/main/res/values-zh-rTW/strings.xml | 6 +-- app/src/main/res/values/strings.xml | 19 ++++++++-- app/src/main/res/xml/app_settings.xml | 9 ++++- 35 files changed, 163 insertions(+), 113 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index 68e50491..eafca03f 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -80,7 +80,8 @@ public class SettingsActivity extends SyncthingActivity { private static final String KEY_STTRACE = "sttrace"; private static final String KEY_EXPORT_CONFIG = "export_config"; private static final String KEY_IMPORT_CONFIG = "import_config"; - private static final String KEY_STRESET = "streset"; + private static final String KEY_ST_RESET_DATABASE = "st_reset_database"; + private static final String KEY_ST_RESET_DELTAS = "st_reset_deltas"; @Inject NotificationHandler mNotificationHandler; @Inject SharedPreferences mPreferences; @@ -184,7 +185,8 @@ public class SettingsActivity extends SyncthingActivity { Preference stTrace = findPreference("sttrace"); Preference environmentVariables = findPreference("environment_variables"); - Preference stReset = findPreference("streset"); + Preference stResetDatabase = findPreference("st_reset_database"); + Preference stResetDeltas = findPreference("st_reset_deltas"); mUseRoot = (CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT); Preference useWakelock = findPreference(Constants.PREF_USE_WAKE_LOCK); @@ -204,7 +206,8 @@ public class SettingsActivity extends SyncthingActivity { stTrace.setOnPreferenceChangeListener(this); environmentVariables.setOnPreferenceChangeListener(this); - stReset.setOnPreferenceClickListener(this); + stResetDatabase.setOnPreferenceClickListener(this); + stResetDeltas.setOnPreferenceClickListener(this); mUseRoot.setOnPreferenceClickListener(this); useWakelock.setOnPreferenceChangeListener((p, o) -> requireRestart()); @@ -376,6 +379,7 @@ public class SettingsActivity extends SyncthingActivity { @Override public boolean onPreferenceClick(Preference preference) { + final Intent intent; switch (preference.getKey()) { case Constants.PREF_USE_ROOT: if (mUseRoot.isChecked()) { @@ -418,16 +422,31 @@ public class SettingsActivity extends SyncthingActivity { .setNegativeButton(android.R.string.no, null) .show(); return true; - case KEY_STRESET: - final Intent intent = new Intent(getActivity(), SyncthingService.class) - .setAction(SyncthingService.ACTION_RESET); + case KEY_ST_RESET_DATABASE: + intent = new Intent(getActivity(), SyncthingService.class) + .setAction(SyncthingService.ACTION_RESET_DATABASE); new AlertDialog.Builder(getActivity()) - .setTitle(R.string.streset_title) - .setMessage(R.string.streset_question) + .setTitle(R.string.st_reset_database_title) + .setMessage(R.string.st_reset_database_question) .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { getActivity().startService(intent); - Toast.makeText(getActivity(), R.string.streset_done, Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), R.string.st_reset_database_done, Toast.LENGTH_LONG).show(); + }) + .setNegativeButton(android.R.string.no, (dialogInterface, i) -> { + }) + .show(); + return true; + case KEY_ST_RESET_DELTAS: + intent = new Intent(getActivity(), SyncthingService.class) + .setAction(SyncthingService.ACTION_RESET_DELTAS); + + new AlertDialog.Builder(getActivity()) + .setTitle(R.string.st_reset_deltas_title) + .setMessage(R.string.st_reset_deltas_question) + .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { + getActivity().startService(intent); + Toast.makeText(getActivity(), R.string.st_reset_deltas_done, Toast.LENGTH_LONG).show(); }) .setNegativeButton(android.R.string.no, (dialogInterface, i) -> { }) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java index 31e2a1fd..57a43be9 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java @@ -55,9 +55,10 @@ public class SyncthingRunnable implements Runnable { @Inject NotificationHandler mNotificationHandler; public enum Command { - generate, // Generate keys, a config file and immediately exit. - main, // Run the main Syncthing application. - reset, // Reset Syncthing's indexes + generate, // Generate keys, a config file and immediately exit. + main, // Run the main Syncthing application. + resetdatabase, // Reset Syncthing's database + resetdeltas, // Reset Syncthing's delta indexes } /** @@ -78,8 +79,11 @@ public class SyncthingRunnable implements Runnable { case main: mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-no-browser", "-logflags=0" }; break; - case reset: - mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset", "-logflags=0" }; + case resetdatabase: + mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset-database", "-logflags=0" }; + break; + case resetdeltas: + mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset-deltas", "-logflags=0" }; break; default: throw new InvalidParameterException("Unknown command option"); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java index 0d4d458a..2f520548 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java @@ -45,8 +45,14 @@ public class SyncthingService extends Service { /** * Intent action to reset Syncthing's database. */ - public static final String ACTION_RESET = - "com.nutomic.syncthingandroid.service.SyncthingService.RESET"; + public static final String ACTION_RESET_DATABASE = + "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DATABASE"; + + /** + * Intent action to reset Syncthing's delta indexes. + */ + public static final String ACTION_RESET_DELTAS = + "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DELTAS"; public static final String ACTION_REFRESH_NETWORK_INFO = "com.nutomic.syncthingandroid.service.SyncthingService.REFRESH_NETWORK_INFO"; @@ -120,9 +126,14 @@ public class SyncthingService extends Service { if (ACTION_RESTART.equals(intent.getAction()) && mCurrentState == State.ACTIVE) { shutdown(State.INIT, () -> new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)); - } else if (ACTION_RESET.equals(intent.getAction())) { + } else if (ACTION_RESET_DATABASE.equals(intent.getAction())) { shutdown(State.INIT, () -> { - new SyncthingRunnable(this, SyncthingRunnable.Command.reset).run(); + new SyncthingRunnable(this, SyncthingRunnable.Command.resetdatabase).run(); + new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + }); + } else if (ACTION_RESET_DELTAS.equals(intent.getAction())) { + shutdown(State.INIT, () -> { + new SyncthingRunnable(this, SyncthingRunnable.Command.resetdeltas).run(); new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }); } else if (ACTION_REFRESH_NETWORK_INFO.equals(intent.getAction())) { diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 411158e6..3bd2b623 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -187,13 +187,13 @@ В настройките на STTRACE са разрешени само символите 0-9, a-z и \',\' - Нулиране на базата данни + Нулиране на базата данни - Действието трябва да се изпълнява след препоръка от поддържащия екип. + Действието трябва да се изпълнява след препоръка от поддържащия екип. \nНаистина ли желаете базата данни на Syncthing\'s да бъде нулирана? - Базата данни на Syncthing е нулирана успешно + Базата данни на Syncthing е нулирана успешно За програмата Отвори журнала diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 452fc4a4..53c974a5 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -222,13 +222,13 @@ Ens podeu informar dels problemes que trobeu a través de Github. Només es permet utilitzar 0-9, a-z i \',\' a les opcions de STTRACE Aquest valor no és una cadena de variable d\'entorn vàlida - Reinicia la base de dades + Reinicia la base de dades - Només hauríeu de fer això si us ho recomana el nostre equip de suport. + Només hauríeu de fer això si us ho recomana el nostre equip de suport. \nSegur que voleu esborrar la base de dades d\'índexs del Syncthing? - La base de dades del Syncthing s\'ha reiniciat amb èxit + La base de dades del Syncthing s\'ha reiniciat amb èxit Quant a Obre el registre diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index eaf6a0de..bd2a78a5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -223,12 +223,12 @@ Všechny zaznamenané chyby prosím hlašte přes Github. V STTRACE jsou povoleny pouze znaky \'0-9\', \'a-z\' a \',\' Hodnota není platným řetězcem proměnné prostředí - Resetovat databázi + Resetovat databázi - Tento krok by měl být proveden pouze na základě doporučení našeho technického týmu. + Tento krok by měl být proveden pouze na základě doporučení našeho technického týmu. \nOpravdu chcete vyčistit databázi aplikace Syncthing? - Databáze aplikace Syncthing úspěšně resetována + Databáze aplikace Syncthing úspěšně resetována O aplikaci Otevřít log diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 25f57d14..560efe5c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -221,12 +221,12 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. Kun 0-9, a-z og \',\' er tilladte i STTRACE options Værdien er ugyldig som miljøvariablestreng - Nulstil database + Nulstil database - Denne handling burde kun gennemføres baseret på anvisning af vores support tem. + Denne handling burde kun gennemføres baseret på anvisning af vores support tem. \nEr du sikker på at du ønsker at nulstille Syncthing\'s indeks database? - Syncthing\'s database successfuldt nulstillet + Syncthing\'s database successfuldt nulstillet Omkring Åben Log diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 66f6c4a1..86361281 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -222,12 +222,12 @@ Bitte melden Sie auftretende Probleme via Github. Nur 0-9, a-z und \',\' sind erlaubt in STTRACE Optionen Wert ist kein gültiger Umgebungsvariablen-String - Datenbank zurücksetzen + Datenbank zurücksetzen - Diese Aktion sollte nur auf Empfehlung des Support-Teams ausgeführt werden. + Diese Aktion sollte nur auf Empfehlung des Support-Teams ausgeführt werden. \nBist du sicher, dass du die Syncthing Datenbank leeren möchtest? - Datenbank erfolgreich zurückgesetzt + Datenbank erfolgreich zurückgesetzt Über Log öffnen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c29ae371..adc46802 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -222,13 +222,13 @@ Οι αποδεκτοί χαρακτήρες στις επιλογές STTRACE είναι τα 0-9, a-z και το \',\'. Η τιμή δεν είναι έγκυρη συμβολοσειρά μεταβλητής περιβάλλοντος - Επαναφορά βάσης δεδομένων + Επαναφορά βάσης δεδομένων - Αυτή η ενέργεια πρέπει να εκτελείται μόνο κατόπιν προτροπής από την ομάδα υποστήριξης μας. + Αυτή η ενέργεια πρέπει να εκτελείται μόνο κατόπιν προτροπής από την ομάδα υποστήριξης μας. \nΣίγουρα επιθυμείτε να διαγράψετε τη βάση δεδομένων ευρετηρίων του Syncthing; - Η επαναφορά της βάσης δεδομένων του Syncthing ήταν επιτυχής + Η επαναφορά της βάσης δεδομένων του Syncthing ήταν επιτυχής Σχετικά με το Syncthing Άνοιγμα καταγραφής συμβάντων diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 87c68577..b93d6d6d 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -168,13 +168,13 @@ - Reiniciar Base de Datos + Reiniciar Base de Datos - Esta acción sólo debe ser realizada basada en una recomendación de nuestro equipo de soporte. + Esta acción sólo debe ser realizada basada en una recomendación de nuestro equipo de soporte. \n¿Está seguro que quiere limpiar el índice de la base de datos de Syncthing? - Satisfactoriamente reiniciada la base de datos de Syncthing + Satisfactoriamente reiniciada la base de datos de Syncthing Acerca de Abrir Registro diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 86a351c6..c3edc756 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -197,12 +197,12 @@ Sólo se permite 0-9, a-z y coma (\',\') en las opciones de STTRACE - Restablecer base de datos + Restablecer base de datos - Esta acción sólo se debería realizar por recomendación de nuestro equipo de soporte. + Esta acción sólo se debería realizar por recomendación de nuestro equipo de soporte. \n¿Estás seguro de que quieres limpiar la base de datos de índices de Syncthing? - Base de datos de Syncthing restablecida con éxito + Base de datos de Syncthing restablecida con éxito Acerca de Abrir registro diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0e5cce83..7fd2e17d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -198,12 +198,12 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta Vain 0-9, a-z ja \',\' ovat sallittuja STTRACE valintoja - Nollaa tietokanta + Nollaa tietokanta - Tätä toimintoa tulee käyttää vain, jos tukemme suosittelee sitä. + Tätä toimintoa tulee käyttää vain, jos tukemme suosittelee sitä. \nOletko varma, että haluat tyhjentää Synthingin indeksitietokannan? - Syncthingin tietokannan tyhjentäminen onnistui + Syncthingin tietokannan tyhjentäminen onnistui Tietoja Avaa loki diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 31bd4957..54bd4e8d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -222,13 +222,13 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.Seulement 0-9, a-z et \',\' sont autorisés dans les options STTRACE La valeur n\'est pas une chaîne de variable d\'environnement valide - Remise à zéro de la base de données + Remise à zéro de la base de données - Cette action ne doit être réalisée que sur recommandation de l\'équipe support. + Cette action ne doit être réalisée que sur recommandation de l\'équipe support. \nEtes-vous sûr de vouloir effacer l\'index de base de données de Syncthing ? - Réinitialisation réussie de la base de données Syncthing + Réinitialisation réussie de la base de données Syncthing A propos Ouvrir le journal diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cf054cd6..c899af9e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -230,13 +230,13 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és Az STTRACE beállítás csak 0-9, a-z és \',\' karaktereket tartalmazhat Az érték nem egy érvényes környezeti változó string - Adatbázis törlése + Adatbázis törlése - Ezt az opciót csak akkor javasolt kiválasztani, ha a kifejezetten ezt javasolta egy fejlesztő. + Ezt az opciót csak akkor javasolt kiválasztani, ha a kifejezetten ezt javasolta egy fejlesztő. Biztosan törölni szeretnéd a Syncthing index adatbázisát? - A Syncthing adatbázisának törlése megtörtént + A Syncthing adatbázisának törlése megtörtént Névjegy Napló megnyitása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8d8b7a7b..803cfe24 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -212,12 +212,12 @@ Jika ada masalah silakan laporkan lewat Github. Hanya 0-9, a-z dan \',\' yang dibolehkan dalam opsi STTRACE - Reset Database + Reset Database - Perintah ini sebaiknya dijalankan hanya menurut saran dari tim dukungan kami. + Perintah ini sebaiknya dijalankan hanya menurut saran dari tim dukungan kami. \nAnda yakin ingin membersihkan database indeks Syncthing? - Berhasil melakukan reset database Syncthing + Berhasil melakukan reset database Syncthing Tentang Buka Log diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 216ebd9e..5b1ff046 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -222,13 +222,13 @@ Si prega di segnalare eventuali problemi che si incontrano via Github. Solo 0-9, a-z e \',\' sono consentiti nelle opzioni STTRACE Il valore non è una stringa valida per una variabile d\'ambiente - Reset del Database + Reset del Database - Questa operazione dovrebbe essere eseguita solo su raccomandazione del nostro team di supporto. + Questa operazione dovrebbe essere eseguita solo su raccomandazione del nostro team di supporto. \nSei sicuro di voler svuotare il database degli indici di Syncthing? - Reset del database di Syncthing riuscito + Reset del database di Syncthing riuscito Info Apri Registro diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c092ff70..6ca9bd71 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -221,12 +221,12 @@ STTRACE オプションでは、0-9、a-z および \',\' のみ使用できます。 値は有効な環境変数文字列ではありません - データベースをリセットする + データベースをリセットする - この操作は、サポートチームに推奨された場合にのみ行ってください。 + この操作は、サポートチームに推奨された場合にのみ行ってください。 \n本当に Syncthing のインデックスデータベースをクリアしてもよろしいですか? - 正常に Syncthing のデータベースをリセットしました + 正常に Syncthing のデータベースをリセットしました アプリについて ログを開く diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1fb092bc..2855b92f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -220,12 +220,12 @@ STTRACE 옵션에서는 0-9, a-z 와 \'.\' 외의 문자를 사용할 수 없습니다. 값이 유효한 환경 변수 문자열이 아닙니다 - 데이터베이스 리셋 + 데이터베이스 리셋 - 이 행동은 우리의 지원팀이 권장한 경우에만 시도하세요. + 이 행동은 우리의 지원팀이 권장한 경우에만 시도하세요. \n정말로 Syncthing의 인덱스 데이터베이스를 지우시겠습니까? - Syncthing의 데이터베이스가 성공적으로 리셋되었습니다 + Syncthing의 데이터베이스가 성공적으로 리셋되었습니다 정보 로그 열기 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 31bf5887..ea10f587 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -173,12 +173,12 @@ - Nullstill database + Nullstill database - Denne operasjonen bør bare utføres på anbefaling fra vår brukerstøttegruppe. + Denne operasjonen bør bare utføres på anbefaling fra vår brukerstøttegruppe. \nEr du sikker på at du vil nullstille Syncthings indeks-database? - Nullstilling av Syncthings database var vellykket + Nullstilling av Syncthings database var vellykket Om Åpne logg diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5121d286..edc9db7b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -222,12 +222,12 @@ Als je problemen tegenkomt, meld ze dan via GitHub. Enkel 0-9, a-z en \',\' zijn toegestaan in STTRACE-opties Waarde is geen geldige omgevingsvariabele - Database opnieuw instellen + Database opnieuw instellen - Deze actie moet je enkel uitvoeren wanneer ons ondersteuningsteam je dit aanraadt. + Deze actie moet je enkel uitvoeren wanneer ons ondersteuningsteam je dit aanraadt. \nZeker dat je de indexdatabase van Syncthing wilt wissen? - Opnieuw instellen van Syncthing-database geslaagd + Opnieuw instellen van Syncthing-database geslaagd Over Log openen diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 8da481f0..dd69ac5d 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -173,12 +173,12 @@ - Nullstill database + Nullstill database - Denne handlinga bør berre utførast om vår brukarstøttegruppe har anbefalt det. + Denne handlinga bør berre utførast om vår brukarstøttegruppe har anbefalt det. \nEr du sikker på at du vil nullstille indeksdatabasen til Syncthing? - Vellukka nullstilling av Syncthings database + Vellukka nullstilling av Syncthings database Om Opne logg diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e398b251..52214297 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -191,13 +191,13 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.< Tylko 0-9, a-z i \",\" są dozwolone w opcjach STTRACE - Przywróć pierwotny stan bazy danych + Przywróć pierwotny stan bazy danych - To działanie powinno się przeprowadzać tylko, kiedy jest ono zalecone przez dział wsparcia programu. + To działanie powinno się przeprowadzać tylko, kiedy jest ono zalecone przez dział wsparcia programu. \nPrzywrócić bazę danych do stanu początkowego? - Przywrócono stan początkowy bazy danych + Przywrócono stan początkowy bazy danych O programie Otwórz dziennik diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index da44fbae..1c32e2e1 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -218,13 +218,13 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.Somente os caracteres 0-9, a-z e vírgula são permitidos nas opções de STTRACE O a variável de ambiente não é um valor válido - Limpar banco de dados + Limpar banco de dados - Esta ação deve ser executada somente com base em uma recomendação da nossa equipe de suporte. + Esta ação deve ser executada somente com base em uma recomendação da nossa equipe de suporte. \nTem certeza de que quer limpar o banco de dados do Syncthing? - O banco de dados do Syncthing foi limpo com sucesso + O banco de dados do Syncthing foi limpo com sucesso Sobre Abrir log diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 40d13001..fcf7a70e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -193,13 +193,13 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor. Nas opções STTRACE apenas é permitido 0-9, a-z e \',\' - Reiniciar a base de dados + Reiniciar a base de dados - Esta acção só deve ser executada com base numa recomendação da nossa equipa de suporte. + Esta acção só deve ser executada com base numa recomendação da nossa equipa de suporte. \nTem a certeza que quer limpar o índice da base de dados do Syncthing? - Base de dados do Syncthing reiniciada com sucesso. + Base de dados do Syncthing reiniciada com sucesso. Sobre Abrir registo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6dba8109..38392a8e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -223,12 +223,12 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub. Doar 0-9, a-z și \',\' sunt permise în opțiunile STTRACE Această valoare nu este un șir de variabile de mediu valabil - Resetează baza de date + Resetează baza de date - Această acțiune ar trebui efectuată numai la recomandarea echipei noastre de suport tehnic. + Această acțiune ar trebui efectuată numai la recomandarea echipei noastre de suport tehnic. \nSigur doriți să ștergeți indexul bazei de date Syncthing? - Baza de date Syncthing a fost resetată cu succes + Baza de date Syncthing a fost resetată cu succes Despre Deschide jurnal de erori diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d62ed14e..68e433ef 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -195,13 +195,13 @@ Только 0-9, a-z и \',\' допустимы для параметра STTRACE - Сбросить базу данных + Сбросить базу данных - Это действие должно выполняться только по рекомендации нашей поддержки. + Это действие должно выполняться только по рекомендации нашей поддержки. \nВы уверены что хотите очистить индекс базы Syncthing? - БД Syncthing успешно сброшена + БД Syncthing успешно сброшена О программе Открыть лог diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 3c297e09..c8cdd3eb 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -156,12 +156,12 @@ - Resetovať Databázu + Resetovať Databázu - Túto možnosť by ste mali využiť iba ak Vám to odporučí naša podpora.\n + Túto možnosť by ste mali využiť iba ak Vám to odporučí naša podpora.\n Naozaj chcete resetovať databázu s indexom súborov? - Reset databázy bol úspešný + Reset databázy bol úspešný O programe Zobraziť Záznam diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7feb30e3..75c61d18 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -222,12 +222,12 @@ Vänligen rapportera eventuella problem du stöter på via Github. Endast 0-9, a-z och \',\' är tillåtna i STTRACE alternativ Värdet är inte en giltig miljövariabel sträng - Återställ databas + Återställ databas - Denna åtgärd bör endast utföras baserad på en rekommendation från vår support grupp. + Denna åtgärd bör endast utföras baserad på en rekommendation från vår support grupp. \nÄr du säker på att du vill rensa Syncthings index-databas? - Syncthings databas återställdes + Syncthings databas återställdes Om Öppna logg diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 934b7123..a011db52 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -191,12 +191,12 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir. STTRACE seçeneklerinde yalnızca 0-9, a-z ve \",\" karakterlerine izin verilir - Veritabanını Sıfırla + Veritabanını Sıfırla - Bu eylem yalnızca destek takımımızdan alınan öneriye dayanarak gerçekleştirilmelidir. + Bu eylem yalnızca destek takımımızdan alınan öneriye dayanarak gerçekleştirilmelidir. \nSyncthing\'in dizin veritabanını temizlemek istediğine emin misin? - Syncthing\'in veritabanı başarıyla sıfırlandı. + Syncthing\'in veritabanı başarıyla sıfırlandı. Hakkında Günlüğü Aç diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c70fd4b9..438e0211 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -169,10 +169,10 @@ Значення не відповідає формату рядка змінних оточення - Очистити базу даних + Очистити базу даних - База даних Syncthing успішно очищена + База даних Syncthing успішно очищена Про додаток Відкрити журнал diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index f2bd8b16..b61291d2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -168,13 +168,13 @@ - Cài lại CSDL + Cài lại CSDL - Chỉ nên thực hiện thao tác này dựa trên khuyến nghị từ nhóm hỗ trợ của chúng tôi. + Chỉ nên thực hiện thao tác này dựa trên khuyến nghị từ nhóm hỗ trợ của chúng tôi. \nCó chắc là bạn muốn xoá CSDL chỉ mục của Syncthing? - Cài lại thành công CSDL của Syncthing + Cài lại thành công CSDL của Syncthing Thông tin về Mở lịch sử diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fe0ed6af..d234f9e0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -223,12 +223,12 @@ STTRACE 选项仅允许 0-9、a-z 与半角逗号“,” 该值不是有效的环境变量字符串 - 重置数据库 + 重置数据库 - 本操作仅应在支持团队的推荐下进行。\n + 本操作仅应在支持团队的推荐下进行。\n 您确定要清理 Syncthing 的索引数据库吗？ - 重置 Syncthing 数据库完成 + 重置 Syncthing 数据库完成 关于 打开日志 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a84d2b5f..1d572241 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -221,13 +221,13 @@ STTRACE 選項僅允許 0-9、a-z 及 \',\' 輸入的值不是有效的環境變數字串 - 重設資料庫 + 重設資料庫 - 執行這個動作應該只會基於來自我們支援團隊的建議。 + 執行這個動作應該只會基於來自我們支援團隊的建議。 \n你確定要清除 Syncthing 的索引資料庫？ - 成功重設 Syncthing 資料庫 + 成功重設 Syncthing 資料庫 關於 打開日誌 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fc20e22..5aa0ec9e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -372,15 +372,26 @@ Please report any problems you encounter via Github. Value is not a valid environment variable string - Reset Database + Reset Database - This action should only be performed based on a recommendation from our support team. - \nAre you sure you want to clear Syncthing\'s index database? + This action should only be performed based on a recommendation from our support team. + \nAre you sure you want to clear Syncthing\'s database? - Successfully reset Syncthing\'s database + Successfully reset Syncthing\'s database + + + Reset Delta Indexes + + + This action should only be performed based on a recommendation from our support team. + \nAre you sure you want to clear Syncthing\'s delta indexes? + + + + Successfully reset Syncthing\'s delta indexes About diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index 1681a271..4cab8638 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -174,8 +174,13 @@ android:inputType="textNoSuggestions"/> + +