diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 003f31f851..77df027cbe 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,7 @@ --> + android:versionName="0.1.176B" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/res/values/strings.xml b/res/values/strings.xml index f5cece16d7..9d167e37a0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -71,8 +71,7 @@ Error Directory name Upload was successful - Upload failed: - files uploaded + Upload failed: %1$d/%2$d files uploaded Download was successful Download could not be completed Choose account @@ -132,8 +131,7 @@ Rename Remove - "Do you really want " - "?" + "Do you really want %1$s ?" "Successful removal" "Removal could not be completed" diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java index 93ee82ffe5..8bdcedff96 100644 --- a/src/eu/alefzero/owncloud/files/services/FileUploader.java +++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java @@ -120,9 +120,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe if (mSuccessCounter == mLocalPaths.length) { message = getString(R.string.uploader_upload_succeed); } else { - message = getString(R.string.uploader_upload_failed); - if (mLocalPaths.length > 1) - message += " (" + mSuccessCounter + " / " + mLocalPaths.length + getString(R.string.uploader_files_uploaded_suffix) + ")"; + message = String.format(getString(R.string.uploader_upload_failed), mSuccessCounter, mLocalPaths.length); } Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); } diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java index a50986062f..d977474c7c 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java @@ -35,7 +35,7 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment { return new AlertDialog.Builder(getActivity()) .setIcon(android.R.drawable.ic_dialog_alert) - .setMessage(getString(R.string.confirmation_alert_prefix) + confirmationTarget + getString(R.string.confirmation_alert_suffix)) + .setMessage(String.format(getString(R.string.confirmation_alert_prefix), confirmationTarget)) .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) {