From b2386becfee39d227b3e138b2473b39fb7871ec0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 24 Jan 2019 20:29:30 +0100 Subject: [PATCH 01/22] improving the sideloading check --- build.gradle | 2 +- .../commons/activities/BaseSplashActivity.kt | 36 ++++++++++++------- .../commons/helpers/BaseConfig.kt | 4 +++ .../commons/helpers/Constants.kt | 5 +++ 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index ba7dd654d..e9c74a33e 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.6.14' + propVersionName = '5.6.16' kotlin_version = '1.3.11' } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt index b57bdd157..f2bfdcd21 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt @@ -2,10 +2,14 @@ package com.simplemobiletools.commons.activities import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import com.simplemobiletools.commons.R import com.simplemobiletools.commons.dialogs.AppSideloadedDialog import com.simplemobiletools.commons.extensions.baseConfig import com.simplemobiletools.commons.extensions.getSharedTheme import com.simplemobiletools.commons.extensions.isThankYouInstalled +import com.simplemobiletools.commons.helpers.SIDELOADING_FALSE +import com.simplemobiletools.commons.helpers.SIDELOADING_TRUE +import com.simplemobiletools.commons.helpers.SIDELOADING_UNCHECKED abstract class BaseSplashActivity : AppCompatActivity() { @@ -16,11 +20,15 @@ abstract class BaseSplashActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val packageName = getAppPackageName() - if (isAppSideloaded(packageName)) { - AppSideloadedDialog(this, packageName) { - finish() + if (baseConfig.appSideloadingStatus == SIDELOADING_UNCHECKED) { + val isSideloaded = isAppSideloaded() + baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE + if (isSideloaded) { + showSideloadingDialog() + return } + } else if (baseConfig.appSideloadingStatus == SIDELOADING_TRUE) { + showSideloadingDialog() return } @@ -45,15 +53,19 @@ abstract class BaseSplashActivity : AppCompatActivity() { } } - private fun isAppSideloaded(packageName: String): Boolean { - return if (packageName == "-1" || packageName.endsWith(".debug")) { + private fun isAppSideloaded(): Boolean { + return try { + getDrawable(R.drawable.ic_camera) false - } else { - try { - packageManager.getInstallerPackageName(packageName) == null - } catch (e: Exception) { - false - } + } catch (e: Exception) { + true + } + } + + private fun showSideloadingDialog() { + val packageName = getAppPackageName() + AppSideloadedDialog(this, packageName) { + finish() } } } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt index 2241c5431..5cc113a17 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt @@ -274,4 +274,8 @@ open class BaseConfig(val context: Context) { var wasAppIconCustomizationWarningShown: Boolean get() = prefs.getBoolean(WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN, false) set(wasAppIconCustomizationWarningShown) = prefs.edit().putBoolean(WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN, wasAppIconCustomizationWarningShown).apply() + + var appSideloadingStatus: Int + get() = prefs.getInt(APP_SIDELOADING_STATUS, SIDELOADING_UNCHECKED) + set(appSideloadingStatus) = prefs.edit().putInt(APP_SIDELOADING_STATUS, appSideloadingStatus).apply() } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt index fa0254334..44fb40e42 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt @@ -97,6 +97,7 @@ const val WAS_APP_ON_SD_SHOWN = "was_app_on_sd_shown" const val WAS_BEFORE_ASKING_SHOWN = "was_before_asking_shown" const val WAS_INITIAL_UPGRADE_TO_PRO_SHOWN = "was_initial_upgrade_to_pro_shown" const val WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN = "was_app_icon_customization_warning_shown" +const val APP_SIDELOADING_STATUS = "app_sideloading_status" // licenses internal const val LICENSE_KOTLIN = 1 @@ -190,6 +191,10 @@ const val EVERY_DAY_BIT = MONDAY_BIT or TUESDAY_BIT or WEDNESDAY_BIT or THURSDAY const val WEEK_DAYS_BIT = MONDAY_BIT or TUESDAY_BIT or WEDNESDAY_BIT or THURSDAY_BIT or FRIDAY_BIT const val WEEKENDS_BIT = SATURDAY_BIT or SUNDAY_BIT +const val SIDELOADING_UNCHECKED = 0 +const val SIDELOADING_TRUE = 1 +const val SIDELOADING_FALSE = 2 + val photoExtensions: Array get() = arrayOf(".jpg", ".png", ".jpeg", ".bmp", ".webp") val videoExtensions: Array get() = arrayOf(".mp4", ".mkv", ".webm", ".avi", ".3gp", ".mov", ".m4v", ".3gpp") val audioExtensions: Array get() = arrayOf(".mp3", ".wav", ".wma", ".ogg", ".m4a", ".opus", ".flac", ".aac") From aac4c9f4f015a0857ef45e0f68305d70fe77b805 Mon Sep 17 00:00:00 2001 From: spkprs Date: Fri, 25 Jan 2019 12:07:05 +0200 Subject: [PATCH 02/22] Update strings.xml --- commons/src/main/res/values-el/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index 8d50e474d..c33ff42ae 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -22,7 +22,7 @@ Διαφάνεια Χρώμα διαφάνειας Επιλέξτε διαφορετικό χρώμα - Download + Λήψη Αγαπημένα @@ -401,10 +401,10 @@ Περίοδος καθαρισμού Κάδου ανακύκλωσης Άδειασμα του Κάδου Ανακύκλωσης Εξαναγκασμός σε Πορτρέτο - Export settings - Import settings - Settings exported successfully - Settings imported successfully + Εξαγωγή ρυθμίσεων + Εισαγωγή ρυθμίσεων + Επιτυχής εξαγωγή ρυθμίσεων + Επιτυχής εισαγωγή ρυθμίσεων Προβολή @@ -550,7 +550,7 @@ here. + Φαίνεται ότι η έκδοση της εφαρμογής σας είναι κατεστραμμένη. Κατεβάστε την αρχική έκδοση από εδώ. ]]> From f36a7629dd234c8b889aa2542d784315721dfab3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 25 Jan 2019 23:09:08 +0100 Subject: [PATCH 03/22] updating gradle to 1.3.20 --- build.gradle | 4 ++-- .../commons/activities/BaseSplashActivity.kt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e9c74a33e..6c5978b43 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.6.16' - kotlin_version = '1.3.11' + propVersionName = '5.6.17' + kotlin_version = '1.3.20' } repositories { diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt index f2bfdcd21..8af35334b 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt @@ -12,7 +12,6 @@ import com.simplemobiletools.commons.helpers.SIDELOADING_TRUE import com.simplemobiletools.commons.helpers.SIDELOADING_UNCHECKED abstract class BaseSplashActivity : AppCompatActivity() { - abstract fun initActivity() abstract fun getAppPackageName(): String From b9fcc9edfeec3074ba8e6060700cc69c73059bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sat, 26 Jan 2019 15:16:31 +0000 Subject: [PATCH 04/22] Update strings.xml The changed string "Download" is it a verb or a noun? --- commons/src/main/res/values-pt/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml index 83038c501..85a40ff38 100644 --- a/commons/src/main/res/values-pt/strings.xml +++ b/commons/src/main/res/values-pt/strings.xml @@ -22,7 +22,7 @@ Transparente Cor transparente Selecione uma cor diferente - Download + Descarregar Favoritos @@ -179,8 +179,8 @@ Tem a certeza de que deseja desfazer as alterações? Existem alterações não guardadas. Deseja guardar antes de sair? Aplicar cores a todas as aplicações Simple - WARNING: Some launchers do not handle app icon customization properly. In case the icon will disappear, try launching the app via Google Play or some widget, if available. - Once launched, just set back the default orange icon #F57C00. You might have to reinstall the app in the worst case. + AVISO: alguns launchers não gerem bem a personalização dos ícones. Se o ícone desaparecer, tente iniciar a aplicação através da Google Play ou do widget. + Depois de iniciar a aplicação, reverta para a cor original (#F57C00). No pior cenário, poderá ser necessário reinstalar a aplicação. Cores atualizadas com sucesso. Foi criado o novo tema \'Partilhado\', que pode utilizar para atualizar as cores de todas as aplicações Simple. Intervalo de tempo para limpar a reciclagem Limpar reciclagem Impor modo vertical - Export settings - Import settings - Settings exported successfully - Settings imported successfully + Exportar definições + Importar definições + Definições exportadas com sucesso + Definições importadas com sucesso - Visibilidade + Exibição Segurança Deslocação Operações de ficheiros From 3246b3382021905a1395cb9ed0bcce303ba6e939 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 27 Jan 2019 20:35:55 +0100 Subject: [PATCH 05/22] update version to 5.6.18 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c5978b43..d9bd3a736 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.6.17' + propVersionName = '5.6.18' kotlin_version = '1.3.20' } From 756718c1e14f3a42b6f3b4e066fdee6d80fa78c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 27 Jan 2019 20:52:46 +0100 Subject: [PATCH 06/22] adding a new settings section related to exporting/importing settings --- commons/src/main/res/values-ar/strings.xml | 1 + commons/src/main/res/values-az/strings.xml | 1 + commons/src/main/res/values-br/strings.xml | 1 + commons/src/main/res/values-ca/strings.xml | 1 + commons/src/main/res/values-cs/strings.xml | 1 + commons/src/main/res/values-da/strings.xml | 1 + commons/src/main/res/values-de/strings.xml | 1 + commons/src/main/res/values-el/strings.xml | 1 + commons/src/main/res/values-es/strings.xml | 1 + commons/src/main/res/values-fi/strings.xml | 1 + commons/src/main/res/values-fr/strings.xml | 1 + commons/src/main/res/values-gl/strings.xml | 1 + commons/src/main/res/values-hi-rIN/strings.xml | 1 + commons/src/main/res/values-hr/strings.xml | 1 + commons/src/main/res/values-hu/strings.xml | 1 + commons/src/main/res/values-id/strings.xml | 1 + commons/src/main/res/values-it/strings.xml | 1 + commons/src/main/res/values-iw/strings.xml | 1 + commons/src/main/res/values-ja/strings.xml | 1 + commons/src/main/res/values-ko-rKR/strings.xml | 1 + commons/src/main/res/values-lt/strings.xml | 1 + commons/src/main/res/values-nb/strings.xml | 1 + commons/src/main/res/values-nl/strings.xml | 1 + commons/src/main/res/values-no/strings.xml | 1 + commons/src/main/res/values-pl/strings.xml | 1 + commons/src/main/res/values-pt-rBR/strings.xml | 1 + commons/src/main/res/values-pt/strings.xml | 1 + commons/src/main/res/values-ru/strings.xml | 1 + commons/src/main/res/values-sk/strings.xml | 1 + commons/src/main/res/values-sl/strings.xml | 1 + commons/src/main/res/values-sv/strings.xml | 1 + commons/src/main/res/values-tr/strings.xml | 1 + commons/src/main/res/values-uk/strings.xml | 1 + commons/src/main/res/values-zh-rCN/strings.xml | 1 + commons/src/main/res/values-zh-rTW/strings.xml | 1 + commons/src/main/res/values/strings.xml | 1 + 36 files changed, 36 insertions(+) diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml index 45eee78db..f03f33c05 100644 --- a/commons/src/main/res/values-ar/strings.xml +++ b/commons/src/main/res/values-ar/strings.xml @@ -422,6 +422,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml index c0e633518..4c0903c4a 100644 --- a/commons/src/main/res/values-az/strings.xml +++ b/commons/src/main/res/values-az/strings.xml @@ -415,6 +415,7 @@ Saxlama Başlanğıc Mətn + Migrating Bu faylı geri qaytar diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml index fe2fa7e0a..9449b2b8b 100644 --- a/commons/src/main/res/values-br/strings.xml +++ b/commons/src/main/res/values-br/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index 3c5ffa370..e5c0ee70e 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -418,6 +418,7 @@ Desant Inici Text + Migrating Restaura aquest fitxer diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml index 74b58798a..b4dc6836c 100644 --- a/commons/src/main/res/values-cs/strings.xml +++ b/commons/src/main/res/values-cs/strings.xml @@ -432,6 +432,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml index 565db9acb..36897003b 100644 --- a/commons/src/main/res/values-da/strings.xml +++ b/commons/src/main/res/values-da/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml index b254fabc1..39cc0c3dd 100644 --- a/commons/src/main/res/values-de/strings.xml +++ b/commons/src/main/res/values-de/strings.xml @@ -415,6 +415,7 @@ Speichern Beim Starten Text + Migrating Diese Datei wiederherstellen diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index c33ff42ae..3375cadf1 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -415,6 +415,7 @@ Εξοικονόμηση Εκκίνηση Κείμενο + Migrating Επαναφορά αυτού του αρχείου diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml index 2fe91ce3b..3dd5b1244 100644 --- a/commons/src/main/res/values-es/strings.xml +++ b/commons/src/main/res/values-es/strings.xml @@ -415,6 +415,7 @@ Guardando Puesta en marcha Texto + Migrating Restaurar el fichero diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml index 48f7c45d6..e5f2e6f2e 100644 --- a/commons/src/main/res/values-fi/strings.xml +++ b/commons/src/main/res/values-fi/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml index e8d94ca30..78de097ca 100644 --- a/commons/src/main/res/values-fr/strings.xml +++ b/commons/src/main/res/values-fr/strings.xml @@ -417,6 +417,7 @@ Enregistrement en cours… Démarrage en cours… Texte + Migrating Récupérer ce fichier diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml index 315e1fc4d..dadd70587 100644 --- a/commons/src/main/res/values-gl/strings.xml +++ b/commons/src/main/res/values-gl/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml index 1df9af2ea..7582f8bb5 100644 --- a/commons/src/main/res/values-hi-rIN/strings.xml +++ b/commons/src/main/res/values-hi-rIN/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml index ff4f259a5..d9d4ebcb1 100644 --- a/commons/src/main/res/values-hr/strings.xml +++ b/commons/src/main/res/values-hr/strings.xml @@ -435,6 +435,7 @@ Spremanje Pokretanje Tekst + Migrating Vrati ovu datoteku diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml index c038fbc04..e4f621615 100644 --- a/commons/src/main/res/values-hu/strings.xml +++ b/commons/src/main/res/values-hu/strings.xml @@ -414,6 +414,7 @@ Mentés Indítás Szöveg + Migrating Fájl visszaállítása diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml index f3cd5e185..1f3022d4d 100644 --- a/commons/src/main/res/values-id/strings.xml +++ b/commons/src/main/res/values-id/strings.xml @@ -415,6 +415,7 @@ Menyimpan Saat memulai Teks + Migrating Pulihkan file ini diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml index f3eca8911..e9b508ed9 100644 --- a/commons/src/main/res/values-it/strings.xml +++ b/commons/src/main/res/values-it/strings.xml @@ -415,6 +415,7 @@ Salvataggio Avvio Testo + Migrating Ripristina questo file diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml index caa1f9820..b8b313074 100644 --- a/commons/src/main/res/values-iw/strings.xml +++ b/commons/src/main/res/values-iw/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml index 92ce4357e..aa5a60aaa 100644 --- a/commons/src/main/res/values-ja/strings.xml +++ b/commons/src/main/res/values-ja/strings.xml @@ -415,6 +415,7 @@ 保存中 Startup Text + Migrating このファイルを復元 diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml index 44a54c9f6..aaef4535d 100644 --- a/commons/src/main/res/values-ko-rKR/strings.xml +++ b/commons/src/main/res/values-ko-rKR/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml index decc39429..811f5d607 100644 --- a/commons/src/main/res/values-lt/strings.xml +++ b/commons/src/main/res/values-lt/strings.xml @@ -432,6 +432,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml index 07eb54da9..48034513a 100644 --- a/commons/src/main/res/values-nb/strings.xml +++ b/commons/src/main/res/values-nb/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Gjenopprett denne filen diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index b8ad6fbe8..4af8971b0 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -415,6 +415,7 @@ Opslaan Opstarten Tekst + Migrating Bestand herstellen diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml index 718ef52fc..93fe3868a 100644 --- a/commons/src/main/res/values-no/strings.xml +++ b/commons/src/main/res/values-no/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml index d1d458b28..82f72df7b 100644 --- a/commons/src/main/res/values-pl/strings.xml +++ b/commons/src/main/res/values-pl/strings.xml @@ -434,6 +434,7 @@ Zachowywanie Uruchamianie Tekst + Migrating Przywróć ten plik diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml index 3eb5e3797..1142f7820 100644 --- a/commons/src/main/res/values-pt-rBR/strings.xml +++ b/commons/src/main/res/values-pt-rBR/strings.xml @@ -415,6 +415,7 @@ Salvando Inicialização Texto + Migrating Restore this file diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml index 85a40ff38..35ecdf865 100644 --- a/commons/src/main/res/values-pt/strings.xml +++ b/commons/src/main/res/values-pt/strings.xml @@ -415,6 +415,7 @@ Guardar Arranque Texto + Migrating Restaurar este ficheiro diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml index 2c1f41c2f..f2b5b04d9 100644 --- a/commons/src/main/res/values-ru/strings.xml +++ b/commons/src/main/res/values-ru/strings.xml @@ -436,6 +436,7 @@ Сохранение Запуск Текст + Migrating Восстановить этот файл diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml index 8eb9171fb..c97de8c61 100644 --- a/commons/src/main/res/values-sk/strings.xml +++ b/commons/src/main/res/values-sk/strings.xml @@ -436,6 +436,7 @@ Ukladanie Po spustení Text + Migrovanie Obnoviť tento súbor diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml index 48a3b0c41..d5faebd9f 100644 --- a/commons/src/main/res/values-sl/strings.xml +++ b/commons/src/main/res/values-sl/strings.xml @@ -456,6 +456,7 @@ Shranjevanje Zagon Besedilo + Migrating Obnovi to datoteko diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml index 9d208277e..7c0346630 100644 --- a/commons/src/main/res/values-sv/strings.xml +++ b/commons/src/main/res/values-sv/strings.xml @@ -415,6 +415,7 @@ Sparande Start Text + Migrating Återställ filen diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml index 21f473d97..c37ea9e92 100644 --- a/commons/src/main/res/values-tr/strings.xml +++ b/commons/src/main/res/values-tr/strings.xml @@ -415,6 +415,7 @@ Kaydetme Başlangıç Metin + Migrating Bu dosyayı geri yükle diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml index 2d20371c3..cfb5f04e8 100644 --- a/commons/src/main/res/values-uk/strings.xml +++ b/commons/src/main/res/values-uk/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml index 0e5edbe0c..c519d3844 100644 --- a/commons/src/main/res/values-zh-rCN/strings.xml +++ b/commons/src/main/res/values-zh-rCN/strings.xml @@ -415,6 +415,7 @@ 正在保存 启动 文本 + Migrating 恢复此文件 diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml index dab36d286..d789d6b8d 100644 --- a/commons/src/main/res/values-zh-rTW/strings.xml +++ b/commons/src/main/res/values-zh-rTW/strings.xml @@ -415,6 +415,7 @@ 儲存中 啟動 文字 + Migrating 還原這個檔案 diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml index 7e8e98213..89e7da676 100644 --- a/commons/src/main/res/values/strings.xml +++ b/commons/src/main/res/values/strings.xml @@ -415,6 +415,7 @@ Saving Startup Text + Migrating Restore this file From ca3d81a7fd7f508e2a87a8f5181a1a6324390921 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 27 Jan 2019 20:52:56 +0100 Subject: [PATCH 07/22] updating version to 5.6.19 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d9bd3a736..7ab02aa29 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.6.18' + propVersionName = '5.6.19' kotlin_version = '1.3.20' } From 1b399bc315ef5b89f8c743f4e7e6c99ce30495af Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 28 Jan 2019 02:53:25 +0100 Subject: [PATCH 08/22] Dutch --- commons/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index 4af8971b0..01aaddb7c 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -415,7 +415,7 @@ Opslaan Opstarten Tekst - Migrating + Migreren Bestand herstellen From c91c91509bb170b06eaccecde2e573d9b00867aa Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 Jan 2019 10:47:40 +0100 Subject: [PATCH 09/22] creating a dialog for selecting a file at Export Settings --- .../commons/dialogs/ExportSettingsDialog.kt | 55 +++++++++++++++++++ .../res/layout/dialog_export_settings.xml | 51 +++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ExportSettingsDialog.kt create mode 100644 commons/src/main/res/layout/dialog_export_settings.xml diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ExportSettingsDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ExportSettingsDialog.kt new file mode 100644 index 000000000..4d3a0f8d0 --- /dev/null +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ExportSettingsDialog.kt @@ -0,0 +1,55 @@ +package com.simplemobiletools.commons.dialogs + +import androidx.appcompat.app.AlertDialog +import com.simplemobiletools.commons.R +import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.* +import kotlinx.android.synthetic.main.dialog_export_settings.view.* + +class ExportSettingsDialog(val activity: BaseSimpleActivity, val defaultFilename: String, callback: (path: String) -> Unit) { + init { + var folder = activity.internalStoragePath + val view = activity.layoutInflater.inflate(R.layout.dialog_export_settings, null).apply { + export_settings_filename.setText(defaultFilename) + export_settings_path.text = activity.humanizePath(folder) + export_settings_path.setOnClickListener { + FilePickerDialog(activity, folder, false, showFAB = true) { + export_settings_path.text = activity.humanizePath(it) + folder = it + } + } + } + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this, R.string.export_settings) { + getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { + val filename = view.export_settings_filename.value + if (filename.isEmpty()) { + activity.toast(R.string.filename_cannot_be_empty) + return@setOnClickListener + } + + val newPath = "${folder.trimEnd('/')}/$filename" + if (!newPath.getFilenameFromPath().isAValidFilename()) { + activity.toast(R.string.filename_invalid_characters) + return@setOnClickListener + } + + if (activity.getDoesFilePathExist(newPath)) { + val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newPath.getFilenameFromPath()) + ConfirmationDialog(activity, title) { + callback(newPath) + dismiss() + } + } else { + callback(newPath) + dismiss() + } + } + } + } + } +} diff --git a/commons/src/main/res/layout/dialog_export_settings.xml b/commons/src/main/res/layout/dialog_export_settings.xml new file mode 100644 index 000000000..56cd55804 --- /dev/null +++ b/commons/src/main/res/layout/dialog_export_settings.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + From c88d2218dd9a8444af6f19551ac24d7f0f6c454f Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 Jan 2019 11:02:02 +0100 Subject: [PATCH 10/22] add handling for exporting app settings --- build.gradle | 2 +- .../commons/activities/BaseSimpleActivity.kt | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7ab02aa29..9b44ef050 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.6.19' + propVersionName = '5.7.0' kotlin_version = '1.3.20' } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt index f2c5f744a..b6ab2499a 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt @@ -17,6 +17,7 @@ import androidx.core.util.Pair import com.simplemobiletools.commons.R import com.simplemobiletools.commons.asynctasks.CopyMoveTask import com.simplemobiletools.commons.dialogs.ConfirmationDialog +import com.simplemobiletools.commons.dialogs.ExportSettingsDialog import com.simplemobiletools.commons.dialogs.FileConflictDialog import com.simplemobiletools.commons.dialogs.WritePermissionDialog import com.simplemobiletools.commons.extensions.* @@ -404,4 +405,31 @@ abstract class BaseSimpleActivity : AppCompatActivity() { ConfirmationDialog(this, "", R.string.app_on_sd_card, R.string.ok, 0) {} } } + + fun exportSettings(configItems: LinkedHashMap, defaultFilename: String) { + handlePermission(PERMISSION_WRITE_STORAGE) { + if (it) { + ExportSettingsDialog(this, defaultFilename) { + val file = File(it) + val fileDirItem = FileDirItem(file.absolutePath, file.name) + getFileOutputStream(fileDirItem, true) { + if (it == null) { + toast(R.string.unknown_error_occurred) + return@getFileOutputStream + } + + Thread { + it.bufferedWriter().use { out -> + for ((key, value) in configItems) { + out.writeLn("$key=$value") + } + } + + toast(R.string.settings_exported_successfully) + }.start() + } + } + } + } + } } From 3194b6e587d36a1ac1db0dfde0b092f6ac80d86a Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 Jan 2019 12:39:53 +0100 Subject: [PATCH 11/22] adding a new string for missing entries at importing --- build.gradle | 2 +- commons/src/main/res/values-ar/strings.xml | 1 + commons/src/main/res/values-az/strings.xml | 1 + commons/src/main/res/values-br/strings.xml | 1 + commons/src/main/res/values-ca/strings.xml | 1 + commons/src/main/res/values-cs/strings.xml | 1 + commons/src/main/res/values-da/strings.xml | 1 + commons/src/main/res/values-de/strings.xml | 1 + commons/src/main/res/values-el/strings.xml | 1 + commons/src/main/res/values-es/strings.xml | 1 + commons/src/main/res/values-fi/strings.xml | 1 + commons/src/main/res/values-fr/strings.xml | 1 + commons/src/main/res/values-gl/strings.xml | 1 + commons/src/main/res/values-hi-rIN/strings.xml | 1 + commons/src/main/res/values-hr/strings.xml | 1 + commons/src/main/res/values-hu/strings.xml | 1 + commons/src/main/res/values-id/strings.xml | 1 + commons/src/main/res/values-it/strings.xml | 1 + commons/src/main/res/values-iw/strings.xml | 1 + commons/src/main/res/values-ja/strings.xml | 1 + commons/src/main/res/values-ko-rKR/strings.xml | 1 + commons/src/main/res/values-lt/strings.xml | 1 + commons/src/main/res/values-nb/strings.xml | 1 + commons/src/main/res/values-nl/strings.xml | 1 + commons/src/main/res/values-no/strings.xml | 1 + commons/src/main/res/values-pl/strings.xml | 1 + commons/src/main/res/values-pt-rBR/strings.xml | 1 + commons/src/main/res/values-pt/strings.xml | 1 + commons/src/main/res/values-ru/strings.xml | 1 + commons/src/main/res/values-sk/strings.xml | 1 + commons/src/main/res/values-sl/strings.xml | 1 + commons/src/main/res/values-sv/strings.xml | 1 + commons/src/main/res/values-tr/strings.xml | 1 + commons/src/main/res/values-uk/strings.xml | 1 + commons/src/main/res/values-zh-rCN/strings.xml | 1 + commons/src/main/res/values-zh-rTW/strings.xml | 1 + commons/src/main/res/values/strings.xml | 1 + 37 files changed, 37 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b44ef050..1a24a6825 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.7.0' + propVersionName = '5.7.1' kotlin_version = '1.3.20' } diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml index f03f33c05..059b1610f 100644 --- a/commons/src/main/res/values-ar/strings.xml +++ b/commons/src/main/res/values-ar/strings.xml @@ -448,6 +448,7 @@ فشلت عملية التصدير فشل استيراد بعض المدخلات فشل تصدير بعض المدخلات + No entries for importing have been found لم يتم العثور على مدخلات للتصدير diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml index 4c0903c4a..43a712906 100644 --- a/commons/src/main/res/values-az/strings.xml +++ b/commons/src/main/res/values-az/strings.xml @@ -441,6 +441,7 @@ Çıxarış uğursuzdur Bəzi girişləri daxil etmək olmur Bəzi girişləri çıxarmaq olmur + No entries for importing have been found Çıxarış üçün heçbir giriş tapılmadı diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml index 9449b2b8b..e922502d4 100644 --- a/commons/src/main/res/values-br/strings.xml +++ b/commons/src/main/res/values-br/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index e5c0ee70e..c60082a4a 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -444,6 +444,7 @@ Exportació fallida L\'impotació d\'algunes entrades ha fallat L\'exportació d\'algunes entrades ha fallat + No entries for importing have been found No s\'han trobat entrades per exportar diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml index b4dc6836c..288de2a9d 100644 --- a/commons/src/main/res/values-cs/strings.xml +++ b/commons/src/main/res/values-cs/strings.xml @@ -458,6 +458,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml index 36897003b..e0a64d1eb 100644 --- a/commons/src/main/res/values-da/strings.xml +++ b/commons/src/main/res/values-da/strings.xml @@ -441,6 +441,7 @@ Eksport mislykkedes Import mislykkedes delvist Eksport mislykkedes delvist + No entries for importing have been found Der er ikke fundet indhold til eksport diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml index 39cc0c3dd..d297ff46a 100644 --- a/commons/src/main/res/values-de/strings.xml +++ b/commons/src/main/res/values-de/strings.xml @@ -441,6 +441,7 @@ Exportieren fehlgeschlagen Importieren einiger Einträge fehlgeschlagen Exportieren einiger Einträge fehlgeschlagen + No entries for importing have been found Keine Einträge zum Exportieren gefunden diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index 3375cadf1..8caf32c62 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -441,6 +441,7 @@ Η Εξαγωγή απέτυχε Η Εισαγωγή μερικών καταχωρήσεων απέτυχε Η Εξαγωγή μερικών καταχωρήσεων απέτυχε + No entries for importing have been found Δεν βρέθηκαν καταχωρήσεις για Εξαγωγή diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml index 3dd5b1244..f374b311d 100644 --- a/commons/src/main/res/values-es/strings.xml +++ b/commons/src/main/res/values-es/strings.xml @@ -441,6 +441,7 @@ Exportación fallida La importación de algunas entradas ha fallado La exportación de algunas entradas ha fallado + No entries for importing have been found No se han encontrado entradas para exportar diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml index e5f2e6f2e..868101549 100644 --- a/commons/src/main/res/values-fi/strings.xml +++ b/commons/src/main/res/values-fi/strings.xml @@ -441,6 +441,7 @@ Vienti epäonnistui Joidenkin kohteiden tuonti epäonnistui Joidenkin kohteiden vienti epäonnistui + No entries for importing have been found Vientikohteita ei löydetty diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml index 78de097ca..288594b6b 100644 --- a/commons/src/main/res/values-fr/strings.xml +++ b/commons/src/main/res/values-fr/strings.xml @@ -443,6 +443,7 @@ Échec de l\'exportation Échec de l\'importation de certains éléments Échec de l\'exportation de certains éléments + No entries for importing have been found Aucun élément pouvant être exporté n\'a été trouvé diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml index dadd70587..d77094cfe 100644 --- a/commons/src/main/res/values-gl/strings.xml +++ b/commons/src/main/res/values-gl/strings.xml @@ -441,6 +441,7 @@ Exportación fallida La importación de algunas entradas ha fallado La exportación de algunas entradas ha fallado + No entries for importing have been found No se han encontrado entradas para exportar diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml index 7582f8bb5..b5ab9cf8a 100644 --- a/commons/src/main/res/values-hi-rIN/strings.xml +++ b/commons/src/main/res/values-hi-rIN/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml index d9d4ebcb1..405d1dcbc 100644 --- a/commons/src/main/res/values-hr/strings.xml +++ b/commons/src/main/res/values-hr/strings.xml @@ -461,6 +461,7 @@ Izvoz nije uspio Uvoz nekih unosa nije uspio Izvoz nekih unosa nije uspio + No entries for importing have been found Nije pronađen nijedan unos za izvoz diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml index e4f621615..d082205c3 100644 --- a/commons/src/main/res/values-hu/strings.xml +++ b/commons/src/main/res/values-hu/strings.xml @@ -440,6 +440,7 @@ Sikertelen exportálás Egyes elemek importálása nem sikerült Egyes elemek exportálása nem sikerült + No entries for importing have been found Az exportáláshoz nem találhatóak bejegyzések diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml index 1f3022d4d..831a2a78c 100644 --- a/commons/src/main/res/values-id/strings.xml +++ b/commons/src/main/res/values-id/strings.xml @@ -441,6 +441,7 @@ Gagal mengekspor Gagal mengimpor beberapa entri Gagal mengekspor beberapa entri + No entries for importing have been found Tidak ditemukan entri untuk diekspor diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml index e9b508ed9..5f0cb07e5 100644 --- a/commons/src/main/res/values-it/strings.xml +++ b/commons/src/main/res/values-it/strings.xml @@ -441,6 +441,7 @@ Esportazione fallita Importazione di alcuni elementi fallita Esportazione di alcuni elementi fallita + No entries for importing have been found Nessun elemento trovato da esportare diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml index b8b313074..16c72a570 100644 --- a/commons/src/main/res/values-iw/strings.xml +++ b/commons/src/main/res/values-iw/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml index aa5a60aaa..8b0c7ac14 100644 --- a/commons/src/main/res/values-ja/strings.xml +++ b/commons/src/main/res/values-ja/strings.xml @@ -441,6 +441,7 @@ エクスポートに失敗しました 一部のエントリのインポートに失敗しました 一部のエントリのエクスポートに失敗しました + No entries for importing have been found エクスポートするエントリが見つかりませんでした diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml index aaef4535d..e4f9fc8eb 100644 --- a/commons/src/main/res/values-ko-rKR/strings.xml +++ b/commons/src/main/res/values-ko-rKR/strings.xml @@ -441,6 +441,7 @@ 내보내기 실패 일부항목 가져오기에 실패함 일부항목 내보내기에 실패함 + No entries for importing have been found 내보낼 수 있는 항목을 찾을 수 없음 diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml index 811f5d607..4f41afd5f 100644 --- a/commons/src/main/res/values-lt/strings.xml +++ b/commons/src/main/res/values-lt/strings.xml @@ -458,6 +458,7 @@ Eksportavimas nepavyko Kai kurių įrašų importuoti nepavyko Kai kurių įrašų eksportuoti nepavyko + No entries for importing have been found Nerasta įrašų eksportavimui diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml index 48034513a..19e5689e0 100644 --- a/commons/src/main/res/values-nb/strings.xml +++ b/commons/src/main/res/values-nb/strings.xml @@ -441,6 +441,7 @@ Eksportering feilet Importering av noen oppføringer feilet Eksportering av noen oppføringer feilet + No entries for importing have been found Ingen oppføringer for eksportering er funnet diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index 01aaddb7c..5d57082de 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -441,6 +441,7 @@ Exporteren mislukt Sommige items konden niet worden geïmporteerd Sommige items konden niet worden geëxporteerd + No entries for importing have been found Er zijn geen items gevonden om te exporteren diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml index 93fe3868a..4702f0d7c 100644 --- a/commons/src/main/res/values-no/strings.xml +++ b/commons/src/main/res/values-no/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml index 82f72df7b..03ee864d8 100644 --- a/commons/src/main/res/values-pl/strings.xml +++ b/commons/src/main/res/values-pl/strings.xml @@ -461,6 +461,7 @@    Eksportowanie nie powiodło się    Importowanie niektórych wpisów nie powiodło się    Eksportowanie niektórych wpisów nie powiodło się + No entries for importing have been found    Nie znalazłem żadnych wpisów do wyeksportowania diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml index 1142f7820..c4da6f5fc 100644 --- a/commons/src/main/res/values-pt-rBR/strings.xml +++ b/commons/src/main/res/values-pt-rBR/strings.xml @@ -441,6 +441,7 @@ Falha na exportação Houve falha em alguns ítens da importação Houve falha em alguns ítens da exportação + No entries for importing have been found Não foram encontramos ítens para exportar diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml index 35ecdf865..684c02afe 100644 --- a/commons/src/main/res/values-pt/strings.xml +++ b/commons/src/main/res/values-pt/strings.xml @@ -441,6 +441,7 @@ Falha ao exportar Falha ao importar alguns itens Falha ao exportar alguns itens + No entries for importing have been found Não existem itens para exportação diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml index f2b5b04d9..61b46c511 100644 --- a/commons/src/main/res/values-ru/strings.xml +++ b/commons/src/main/res/values-ru/strings.xml @@ -463,6 +463,7 @@ Экспортирование завершилось неудачей Импортирование некоторых элементов завершилось неудачей Экспортирование некоторых элементов завершилось неудачей + No entries for importing have been found Отсутствуют элементы для экспортирования diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml index c97de8c61..d4a49145f 100644 --- a/commons/src/main/res/values-sk/strings.xml +++ b/commons/src/main/res/values-sk/strings.xml @@ -463,6 +463,7 @@ Exportovanie zlyhalo Importovanie niektorých položiek zlyhalo Exportovanie niektorých položiek zlyhalo + Nenašli sa žiadne položky pre import Nenašli sa žiadne položky pre export diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml index d5faebd9f..c37b13c66 100644 --- a/commons/src/main/res/values-sl/strings.xml +++ b/commons/src/main/res/values-sl/strings.xml @@ -484,6 +484,7 @@ Izvažanje neuspešno Uvažanje nekaterih vnosov ni uspelo Izvažanje nekaterih vnosov ni uspelo + No entries for importing have been found Za izvoz ni bilo najdenih nobenih vnosov diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml index 7c0346630..b3517c96a 100644 --- a/commons/src/main/res/values-sv/strings.xml +++ b/commons/src/main/res/values-sv/strings.xml @@ -441,6 +441,7 @@ Exporten misslyckades Importen av vissa poster misslyckades Exporten av vissa poster misslyckades + No entries for importing have been found Inga poster hittades för export diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml index c37ea9e92..df6cd23db 100644 --- a/commons/src/main/res/values-tr/strings.xml +++ b/commons/src/main/res/values-tr/strings.xml @@ -441,6 +441,7 @@ Dışa aktarılamadı Bazı öğeler içe aktarılamadı Bazı öğeler dışa aktarılamadı + No entries for importing have been found Dışa aktarılacak öğe bulunamadı diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml index cfb5f04e8..8db5d3158 100644 --- a/commons/src/main/res/values-uk/strings.xml +++ b/commons/src/main/res/values-uk/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml index c519d3844..b4f8c6f94 100644 --- a/commons/src/main/res/values-zh-rCN/strings.xml +++ b/commons/src/main/res/values-zh-rCN/strings.xml @@ -441,6 +441,7 @@ 导出失败 部分项目导入失败 部分项目导出失败 + No entries for importing have been found 未找到要导出的项目 diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml index d789d6b8d..9f49aca27 100644 --- a/commons/src/main/res/values-zh-rTW/strings.xml +++ b/commons/src/main/res/values-zh-rTW/strings.xml @@ -441,6 +441,7 @@ 匯出失敗 部分項目匯入失敗 部分項目匯出失敗 + No entries for importing have been found 未發現供匯出的項目 diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml index 89e7da676..d4559d4cb 100644 --- a/commons/src/main/res/values/strings.xml +++ b/commons/src/main/res/values/strings.xml @@ -441,6 +441,7 @@ Exporting failed Importing some entries failed Exporting some entries failed + No entries for importing have been found No entries for exporting have been found From 9db73827a013ff8eefa784376b34bbf1a207a49e Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 Jan 2019 20:29:29 +0100 Subject: [PATCH 12/22] adding some Any extensions to be used at importing settings --- build.gradle | 2 +- .../com/simplemobiletools/commons/extensions/Any.kt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Any.kt diff --git a/build.gradle b/build.gradle index 1a24a6825..c406b73f7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.7.1' + propVersionName = '5.7.2' kotlin_version = '1.3.20' } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Any.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Any.kt new file mode 100644 index 000000000..2b969e3fa --- /dev/null +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Any.kt @@ -0,0 +1,8 @@ +package com.simplemobiletools.commons.extensions + +// extensions used mostly at importing app settings for now +fun Any.toBoolean() = toString() == "true" + +fun Any.toInt() = Integer.parseInt(toString()) + +fun Any.toStringSet() = toString().split(",".toRegex()).toSet() From f2eeee1c8d233be38495bd548d6e5bac417e2e84 Mon Sep 17 00:00:00 2001 From: spkprs Date: Mon, 28 Jan 2019 23:42:00 +0200 Subject: [PATCH 13/22] Updated Pity, it does not work ...F Watcher --- commons/src/main/res/values-el/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index 8caf32c62..21bf3008d 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -415,7 +415,7 @@ Εξοικονόμηση Εκκίνηση Κείμενο - Migrating + Μετεγκατάσταση Επαναφορά αυτού του αρχείου @@ -441,7 +441,7 @@ Η Εξαγωγή απέτυχε Η Εισαγωγή μερικών καταχωρήσεων απέτυχε Η Εξαγωγή μερικών καταχωρήσεων απέτυχε - No entries for importing have been found + Δεν βρέθηκαν καταχωρήσεις για Εισαγωγή Δεν βρέθηκαν καταχωρήσεις για Εξαγωγή From 2591e020c13d712bbe2633a07ac7b96beff64498 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 29 Jan 2019 02:13:21 +0100 Subject: [PATCH 14/22] Dutch --- commons/src/main/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index 5d57082de..64dcd114d 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -441,8 +441,8 @@ Exporteren mislukt Sommige items konden niet worden geïmporteerd Sommige items konden niet worden geëxporteerd - No entries for importing have been found - Er zijn geen items gevonden om te exporteren + Er zijn geen te importeren items gevonden + Er zijn geen te exporteren items gevonden USB From 5af3dfceaf9631569af9d76c30e8ddbd8f1df238 Mon Sep 17 00:00:00 2001 From: fricyo <30796677+fricyo@users.noreply.github.com> Date: Tue, 29 Jan 2019 16:36:56 +0800 Subject: [PATCH 15/22] Update Translation --- commons/src/main/res/values-zh-rTW/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml index 9f49aca27..ae87421f8 100644 --- a/commons/src/main/res/values-zh-rTW/strings.xml +++ b/commons/src/main/res/values-zh-rTW/strings.xml @@ -415,7 +415,7 @@ 儲存中 啟動 文字 - Migrating + 搬移 還原這個檔案 @@ -441,7 +441,7 @@ 匯出失敗 部分項目匯入失敗 部分項目匯出失敗 - No entries for importing have been found + 未發現供匯入的項目 未發現供匯出的項目 From 6e32ce28126469134c6f91eada92821f71f2ac36 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 29 Jan 2019 16:14:50 +0100 Subject: [PATCH 16/22] update version to 5.7.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c406b73f7..c2f950217 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.7.2' + propVersionName = '5.7.3' kotlin_version = '1.3.20' } From 00c07dac6d0de4764597f63d08783dc82847ea1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Tue, 29 Jan 2019 16:46:05 +0100 Subject: [PATCH 17/22] Update strings.xml --- commons/src/main/res/values-ca/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index c60082a4a..b1227f8c0 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -22,7 +22,7 @@ Transparent Color transparent Selecciona un color diferent - Download + Descarregar Preferits @@ -179,8 +179,8 @@ ¿Segur que vols desfer els canvis? Tens canvis sense aplicar. Desar abans de sortir? Aplicar els colors a totes les aplicacions Simple Apps - WARNING: Some launchers do not handle app icon customization properly. In case the icon will disappear, try launching the app via Google Play or some widget, if available. - Once launched, just set back the default orange icon #F57C00. You might have to reinstall the app in the worst case. + ADVERTIMENT: alguns llançadors no gestionen la personalització de la icona d\'aplicació correctament. En cas que la icona desaparegui, proveu de llançar l\'aplicació mitjançant Google Play o algun widget, si està disponible. + Un cop llançat, simplement configureu la icona de color taronja per defecte #F57C00. És possible que hàgiu de tornar a instal·lar l\'aplicació en el pitjor dels casos. Colors actualitzats satisfactoriament. S’ha afegit un nou tema anomenat \'Shared\'. Fes -lo servidr per actualitzar els colors de les aplicacions en el futur. Contrasenya per protegir els mitjans amagats Contrasenya per protegir tota l’aplicació Protegir amb contrasenya l\'eliminació i el moviment dels fitxers - Keep old last-modified value at file operations + Manteniu el valor antic modificat per última vegada a les operacions de fitxer Mostra una bombolla d\'informació en elements de desplaçament mitjançant arrossegament de la barra de desplaçament No deixar dormir el telèfon amb la aplicació a primer pla Ignora sempre el diàleg de confirmació d\'eliminació @@ -404,10 +404,10 @@ Interval de neteja de paperera de reciclatge Buida la paperera de reciclatge Força el mode de retrat - Export settings - Import settings - Settings exported successfully - Settings imported successfully + Exportar ajustaments + Importar ajustaments + Ajustaments exportats correctament + Ajustaments importats correctament Visibilitat @@ -418,7 +418,7 @@ Desant Inici Text - Migrating + Migrant Restaura aquest fitxer @@ -444,7 +444,7 @@ Exportació fallida L\'impotació d\'algunes entrades ha fallat L\'exportació d\'algunes entrades ha fallat - No entries for importing have been found + No s'han trobat entrades per importar No s\'han trobat entrades per exportar @@ -555,7 +555,7 @@ here. + Sembla que la versió de l\'aplicació està danyada. Baixeu la versió original aquí. ]]> From 5febc18c763ddcb75ecebac7ac510171b43ccba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Tue, 29 Jan 2019 16:51:43 +0100 Subject: [PATCH 18/22] Update strings.xml --- commons/src/main/res/values-ca/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index c60082a4a..11e7ced9c 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -574,9 +574,9 @@ Sí, mentre arrossegueu un widget a la vostra pantalla d\'inici, apareixerà una pantalla de configuració de widgets. Veureu quadrats de colors a l\'extrem inferior esquerre, només cal prémer-los per seleccionar un color nou. També podeu utilitzar el control lliscant per ajustar l\'alfa. Puc recuperar d\'alguna manera els fitxers eliminats? Si estan realment eliminats no pots fer-ho. Tanmateix, pots habilitar l\'ús d\'una paperera de reciclatge en comptes de suprimir definitivament a la configuració de l\'aplicació. Això només mourà els fitxers en lloc d\'eliminar-los. - The app launcher icon disappeared. What can I do? - It is caused by your launcher not supporting icon customization properly. Try launching the app via Google Play or some widget, if available. - Once launched, just set back the default orange icon #F57C00. You might have to reinstall the app in the worst case. + Ha desaparegut la icona del menú d\'aplicacions. Què puc fer? + El teu llançador no és compatible amb la personalització d\'icones correctament. Intenteu iniciar l\'aplicació mitjançant Google Play o algun widget, si està disponible. + Un cop llançat, simplement configureu la icona de taronja per defecte # F57C00. És possible que hàgiu de tornar a instal·lar l\'aplicació en el pitjor dels casos. Aquesta aplicació fa servir les següents biblioteques de tercers que ens faciliten la feina. Gràcies. From be969e506270a1594f1c07f8ce9d9b3edae8c50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Tue, 29 Jan 2019 17:08:41 +0100 Subject: [PATCH 19/22] Update strings.xml --- commons/src/main/res/values-es/strings.xml | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml index f374b311d..f07da8d5b 100644 --- a/commons/src/main/res/values-es/strings.xml +++ b/commons/src/main/res/values-es/strings.xml @@ -22,7 +22,7 @@ Transparente Color transparente Seleccionar un color diferente - Download + Descarga Favoritos @@ -179,12 +179,12 @@ ¿Seguro que quiere deshacer los cambios? Tiene cambios sin aplicar. ¿Guardar antes de salir? Aplicar colores a todas las aplicaciones Simple Apps - WARNING: Some launchers do not handle app icon customization properly. In case the icon will disappear, try launching the app via Google Play or some widget, if available. - Once launched, just set back the default orange icon #F57C00. You might have to reinstall the app in the worst case. + ADVERTENCIA: Algunos lanzadores no manejan correctamente la personalización del icono de la aplicación. En caso de que el icono desaparezca, intente iniciar la aplicación a través de Google Play o algún widget, si está disponible. + Una vez iniciado, simplemente vuelva a establecer el ícono naranja predeterminado #F57C00. Es posible que tengas que volver a instalar la aplicación en el peor de los casos. Colores actualizados correctamente. Se ha añadido un nuevo tema llamado \'Shared\', Por favor utilicelo para actualizar los colores de todas las aplicaciones en el futuro. Simple Thank You para desbloquear esta función y ayudar al desarrollo. Gracias! + Por favor compra Simple Thank You para desbloquear esta función y ayudar al desarrollo. Gracias! ]]> @@ -386,7 +386,7 @@ Contraseña para proteger los medios ocultos Contraseña para proteger toda la aplicación Protegeger con contraseña eliminar y mover archivos - Keep old last-modified value at file operations + Mantener el último valor modificado por última vez en las operaciones de archivo Mostrar una burbuja de información al desplazar elementos arrastrando la barra de desplazamiento No dejar dormir el teléfono con la aplicación en primer plano Omitir siempre el diálogo de confirmación de eliminación @@ -401,10 +401,10 @@ Intervalo de vaciado de la papelera de reciclaje Vaciar papelera de reciclaje Forzar el modo retrato - Export settings - Import settings - Settings exported successfully - Settings imported successfully + Exportar ajustes + Importar ajustes + Ajustes exportados correctamente + Ajustes importados correctamente Visibilidad @@ -415,7 +415,7 @@ Guardando Puesta en marcha Texto - Migrating + Migrando Restaurar el fichero @@ -441,7 +441,7 @@ Exportación fallida La importación de algunas entradas ha fallado La exportación de algunas entradas ha fallado - No entries for importing have been found + No se han encontrado entradas para importar No se han encontrado entradas para exportar @@ -552,7 +552,7 @@ here. + Parece que la versión de tu aplicación está dañada. Por favor descargue la versión original aquí. ]]> @@ -571,9 +571,9 @@ Sí, al arrastrar un widget en la pantalla de inicio aparece una pantalla de configuración de widgets. Verá cuadrados de colores en la esquina inferior izquierda, solo presione para elegir un nuevo color. Puede usar el control deslizante para ajustar el alfa también. ¿Puedo de alguna manera restaurar archivos borrados? Si realmente fueron eliminados, no puedes. Sin embargo, puedes habilitar el uso de una papelera de reciclaje en lugar de eliminar en la configuración de la aplicación. Eso solo moverá los archivos en lugar de eliminarlos. - The app launcher icon disappeared. What can I do? - It is caused by your launcher not supporting icon customization properly. Try launching the app via Google Play or some widget, if available. - Once launched, just set back the default orange icon #F57C00. You might have to reinstall the app in the worst case. + El icono del iniciador de aplicaciones desapareció. ¿Que puedo hacer? + Esto se debe a que el iniciador no admite correctamente la personalización de iconos. Intenta lanzar la aplicación a través de Google Play o algún widget, si está disponible. + Una vez iniciado, simplemente vuelva a establecer el ícono naranja predeterminado #F57C00. Es posible que tenga que volver a instalar la aplicación en el peor de los casos. Esta aplicación usa las siguientes bibliotecas de terceros que hacen mi vida más fácil. Gracias. From 081a195a8ba9e230f3c510b171c96f56a37fc51a Mon Sep 17 00:00:00 2001 From: Emanuele Petriglia Date: Tue, 29 Jan 2019 17:22:18 +0000 Subject: [PATCH 20/22] Update italian translation --- commons/src/main/res/values-it/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml index 5f0cb07e5..a1b07cb4a 100644 --- a/commons/src/main/res/values-it/strings.xml +++ b/commons/src/main/res/values-it/strings.xml @@ -401,10 +401,10 @@ Intervallo svuotamento cestino Svuota il cestino Forza la modalità ritratto - Export settings - Import settings - Settings exported successfully - Settings imported successfully + Esporta impostazioni + Imposta impostazioni + Impostazioni esportate correttamente + Impostazioni importate correttamente Visibilità @@ -415,7 +415,7 @@ Salvataggio Avvio Testo - Migrating + Migrazione Ripristina questo file @@ -441,7 +441,7 @@ Esportazione fallita Importazione di alcuni elementi fallita Esportazione di alcuni elementi fallita - No entries for importing have been found + Nessun elemento trovato da importare Nessun elemento trovato da esportare @@ -552,7 +552,7 @@ here. + Sembra che la propria versione sia corrotta. Scaricare la versione originale qui. ]]> From 91de0eb990ad81791d7d6ebf2505e6be1b995398 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 29 Jan 2019 19:15:18 +0100 Subject: [PATCH 21/22] update version to 5.7.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c2f950217..6d8007d67 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.7.3' + propVersionName = '5.7.4' kotlin_version = '1.3.20' } From 2fe7e38b1b723cc796f96bce2b05cce8d185a1cf Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 29 Jan 2019 19:19:49 +0100 Subject: [PATCH 22/22] escaping an apostrophe --- build.gradle | 2 +- commons/src/main/res/values-ca/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6d8007d67..27910257b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.7.4' + propVersionName = '5.7.5' kotlin_version = '1.3.20' } diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index 9e39d9cfd..89f65bc7f 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -444,7 +444,7 @@ Exportació fallida L\'impotació d\'algunes entrades ha fallat L\'exportació d\'algunes entrades ha fallat - No s'han trobat entrades per importar + No s\'han trobat entrades per importar No s\'han trobat entrades per exportar