From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 30 Jul 2012 07:46:24 +0000 (+0200)
Subject: Fixed compatibility issue in local deletion and text typo
X-Git-Tag: oc-android-1.4.3~228
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8852fa725ccd1adb25c7af1fd1ddf2429f67a8f?ds=inline

Fixed compatibility issue in local deletion and text typo
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad927040..597c27b2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.188B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.189B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa3e9249..f6bbc0f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -150,7 +150,7 @@
     
 	  <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
 	  <string name="confirmation_remove_local">Local only</string>
-	  <string name="confirmation_remove_remote">Remove form server</string>
+	  <string name="confirmation_remove_remote">Remove from server</string>
 	  <string name="confirmation_remove_remote_and_local">Both remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
index 110f3378..cc6a0f7f 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
@@ -53,8 +53,10 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(String.format(getString(resourceId), confirmationTarget))
-            .setIconAttribute(android.R.attr.alertDialogIcon)
             .setTitle(android.R.string.dialog_alert_title);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+            builder.setIconAttribute(android.R.attr.alertDialogIcon);
+        }
         
         if (posBtn != -1)
             builder.setPositiveButton(posBtn,