diff --git a/res/values/strings.xml b/res/values/strings.xml --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -142,12 +142,12 @@ Sent %1$d out of %2$d files - Received file from %2$s - Received %1$d files from %2$s + Received file from %1$s + Received %2$d files from %1$s - Failed receiving file from %3$s - Failed receiving %1$d of %2$d files from %3$s + Failed receiving file from %1$s + Failed receiving %2$d of %3$d files from %1$s Tap to open \'%1s\' Cannot create file %s diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java @@ -513,7 +513,7 @@ //TODO: Show error in notification int failedFiles = info.numberOfFiles() - (info.currentFileNumber - 1); - shareNotification.setFinished(context.getResources().getQuantityString(R.plurals.received_files_fail_title, failedFiles, failedFiles, info.numberOfFiles(), device.getName())); + shareNotification.setFinished(context.getResources().getQuantityString(R.plurals.received_files_fail_title, failedFiles, device.getName(), failedFiles, info.numberOfFiles())); shareNotification.show(); shareNotification = null; currentShareInfo = null; @@ -532,7 +532,7 @@ if (shareNotification != null) { //Update the notification and allow to open the file from it - shareNotification.setFinished(context.getResources().getQuantityString(R.plurals.received_files_title, info.numberOfFiles(), info.numberOfFiles(), device.getName())); + shareNotification.setFinished(context.getResources().getQuantityString(R.plurals.received_files_title, info.numberOfFiles(), device.getName(), info.numberOfFiles())); if (info.numberOfFiles() == 1) { shareNotification.setURI(info.fileDocument.getUri(), info.fileDocument.getType(), info.fileName);