Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67e66016 authored by tibbi's avatar tibbi
Browse files

updating some file operation conflict resolution strings

parent dc33ffee

commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt

+4 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,9 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 
    }

    }





    override fun doInBackground(vararg params: Pair<ArrayList<File>, File>): Boolean? {

    override fun doInBackground(vararg params: Pair<ArrayList<File>, File>): Boolean? {

        if (params.isEmpty())

        if (params.isEmpty()) {

            return false

            return false

        }





        val pair = params[0]

        val pair = params[0]

        mFiles = pair.first!!

        mFiles = pair.first!!
@@ -37,8 +38,9 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 
        for (file in mFiles) {

        for (file in mFiles) {

            try {

            try {

                val curFile = File(pair.second, file.name)

                val curFile = File(pair.second, file.name)

                if (curFile.exists())

                if (curFile.exists()) {

                    continue

                    continue

                }





                copy(file, curFile)

                copy(file, curFile)

            } catch (e: Exception) {

            } catch (e: Exception) {

commons/src/main/res/values-ca/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,9 @@ 
    <string name="unknown_error_occurred">Ha ocorregut un error desconegut</string>

    <string name="unknown_error_occurred">Ha ocorregut un error desconegut</string>





    <!-- Copy conflicts -->

    <!-- Copy conflicts -->

    <string name="file_already_exists">L’arxiu %1$s ja existeix</string>

    <string name="file_already_exists">L’arxiu \"%1$s\" ja existeix</string>

    <string name="file_already_exists_overwrite">L’arxiu %1$s ja existeix. El vos sobreescriure?</string>

    <string name="folder_already_exists">Folder \"%1$s\" already exists</string>

    <string name="select_an_action">Tria una opció</string>

    <string name="merge">Merge</string>

    <string name="overwrite">Sobreescriure</string>

    <string name="overwrite">Sobreescriure</string>

    <string name="skip">Saltar</string>

    <string name="skip">Saltar</string>

    <string name="append">Afegir \'_1\'</string>

    <string name="append">Afegir \'_1\'</string>

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,9 @@ 
    <string name="unknown_error_occurred">Vyskytla se neznámá chyba</string>

    <string name="unknown_error_occurred">Vyskytla se neznámá chyba</string>





    <!-- Copy conflicts -->

    <!-- Copy conflicts -->

    <string name="file_already_exists">Soubor %1$s již existuje</string>

    <string name="file_already_exists">Soubor \"%1$s\" již existuje</string>

    <string name="file_already_exists_overwrite">Soubor %1$s již existuje. Přepsat??</string>

    <string name="folder_already_exists">Složka \"%1$s\" již existuje</string>

    <string name="select_an_action">Zvolte akci</string>

    <string name="merge">Merge</string>

    <string name="overwrite">Přepsat</string>

    <string name="overwrite">Přepsat</string>

    <string name="skip">Přeskočit</string>

    <string name="skip">Přeskočit</string>

    <string name="append">Ponechat s \'_1\'</string>

    <string name="append">Ponechat s \'_1\'</string>

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,9 @@ 
    <string name="unknown_error_occurred">Der opstod en ukendt fejl</string>

    <string name="unknown_error_occurred">Der opstod en ukendt fejl</string>





    <!-- Copy conflicts -->

    <!-- Copy conflicts -->

    <string name="file_already_exists">Filen %1$s findes allerede</string>

    <string name="file_already_exists">Filen \"%1$s\" findes allerede</string>

    <string name="file_already_exists_overwrite">Filen %1$s findes allerede. Overskriv?</string>

    <string name="folder_already_exists">Folder \"%1$s\" already exists</string>

    <string name="select_an_action">Vælg handling</string>

    <string name="merge">Merge</string>

    <string name="overwrite">Overskriv</string>

    <string name="overwrite">Overskriv</string>

    <string name="skip">Skip</string>

    <string name="skip">Skip</string>

    <string name="append">Tilføj med \'_1\'</string>

    <string name="append">Tilføj med \'_1\'</string>

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,9 +78,9 @@ 
    <string name="unknown_error_occurred">Ein unbekannter Fehler ist aufgetreten</string>

    <string name="unknown_error_occurred">Ein unbekannter Fehler ist aufgetreten</string>





    <!-- Copy conflicts -->

    <!-- Copy conflicts -->

    <string name="file_already_exists">Datei %1$s existiert bereits</string>

    <string name="file_already_exists">Datei \"%1$s\" existiert bereits</string>

    <string name="file_already_exists_overwrite">Datei %1$s existiert bereits. Überschreiben?</string>

    <string name="folder_already_exists">Folder \"%1$s\" already exists</string>

    <string name="select_an_action">Aktion auswählen</string>

    <string name="merge">Merge</string>

    <string name="overwrite">Überschreiben</string>

    <string name="overwrite">Überschreiben</string>

    <string name="skip">Überspringen</string>

    <string name="skip">Überspringen</string>

    <string name="append">\'_1\' anhängen</string>

    <string name="append">\'_1\' anhängen</string>