From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 13 Aug 2015 13:57:38 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/af2af7198b3919fb476e78d252e28216bb643d82?hp=f7d6939264b3695e605cfe43b97e22bc32ac174f

Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
---

diff --git a/SETUP.md b/SETUP.md
index 4f9cef9d..59a51cab 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -18,8 +18,8 @@ Open a terminal and type 'android' to start the Android SDK Manager. To build th
 
 * Android SDK Tools and Android SDK Platform-tools (already installed); upgrade to their last versions is usually a good idea.
 * Android SDK Build-Tools; any version from 20 or later should work fine; avoid preview versions, if any available.
-* Android 4.4.2 (API 19), SDK Platform; needed to build the ownCloud app.
-* Android 4.1.2 (API 16), SDK Platform; needed to build the Android Support Library (not neeeded if working with Android Studio or gradle).
+* Android 4.4.2 (API 19), SDK Platform; needed for build/test ownCloud app.
+* Android 5.1.1 (API 22), SDK Platform; needed to build the Android Support Library (not neeeded if working with Android Studio or gradle) and build the owncloud app.
 
 Install any other package you consider interesting, such as emulators.
 
@@ -105,8 +105,8 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 ** owncloud-android
 * If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be
 ** ownCloud Android Library	-> API level 19
-** android-support-appcompat-v7-exploded-aa -> API level 16
-** owncloud-android	-> API level 19 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed.
+** android-support-appcompat-v7-exploded-aa -> API level 22
+** owncloud-android	-> API level 22 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed.
 * After those actions you should be good to go. HAVE FUN!
 
 
@@ -139,7 +139,7 @@ Download/install Android plugin for Maven, then build ownCloud with mvn:
 * cd ..
 * git clone https://github.com/mosabua/maven-android-sdk-deployer.git
 * cd maven-android-sdk-deployer
-* mvn -pl com.simpligility.android.sdk-deployer:android-19 -am install
+* mvn -pl com.simpligility.android.sdk-deployer:android-22 -am install
 * cd ../android/owncloud-android-library
 * mvn install
 * cd ..
diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index 7712342e..8ef7b139 100644
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/res/layout/ssl_untrusted_cert_layout.xml
@@ -21,7 +21,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-	android:padding="@dimen/standard_padding"
+	android:padding="16dp"
     android:orientation="vertical" >
 
 	<TextView
@@ -29,9 +29,10 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_weight="0"
-		android:paddingBottom="@dimen/standard_padding"
+		android:paddingBottom="16dp"
 		android:text="@string/ssl_validator_header"
 		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="@android:color/black"
 		 />
     
 	<TextView
@@ -40,7 +41,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="0"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -51,7 +52,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -61,7 +62,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -71,7 +72,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -81,7 +82,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_no_info_about_error"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -89,7 +90,7 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-    	android:padding="20dp"
+    	android:padding="8dp"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -423,7 +424,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 		android:layout_weight="0"
-		android:paddingTop="@dimen/standard_padding"
+		android:paddingTop="16dp"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
@@ -436,27 +437,27 @@
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />
 
     </LinearLayout>
 
diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 88e49b42..4cbd46a3 100644
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -22,23 +22,24 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
-	android:padding="@dimen/standard_padding">
+	android:padding="16dp">
 
 	<TextView
 		android:id="@+id/header"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/standard_padding"
 		android:text="@string/ssl_validator_header"
+		android:paddingBottom="16dp"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-    
+		android:textColor="@color/black"
+		 />
+
 	<TextView
 		android:id="@+id/reason_cert_not_trusted"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -48,7 +49,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -58,7 +59,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -68,7 +69,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left"
-		android:paddingLeft="20dp"
+		android:paddingLeft="8dp"
 		android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -76,7 +77,7 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-    	android:padding="20dp"
+    	android:padding="8dp"
         android:layout_width="wrap_content"
         android:layout_height="180dp">
         
@@ -94,7 +95,7 @@
 					android:paddingBottom="5dp"
         			android:text="@string/ssl_validator_label_subject"
         			android:textAppearance="?android:attr/textAppearanceMedium"
-					/>
+        		/>
 				
 				<TextView
 				    android:id="@+id/label_subject_CN"
@@ -102,7 +103,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_CN"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_subject_CN"
@@ -111,7 +112,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_subject_O"
@@ -119,7 +120,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_O"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_subject_O"
@@ -128,7 +129,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_subject_OU"
@@ -136,7 +137,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_OU"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_subject_OU"
@@ -145,7 +146,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_subject_ST"
@@ -153,7 +154,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_ST"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_subject_ST"
@@ -162,7 +163,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 
 				<TextView
 				    android:id="@+id/label_subject_C"
@@ -170,7 +171,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_C"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/value_subject_C"
@@ -179,7 +180,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_subject_L"
@@ -187,7 +188,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_L"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_subject_L"
@@ -197,6 +198,7 @@
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
+			    
 
 				<TextView
         			android:id="@+id/label_issuer"
@@ -205,7 +207,7 @@
 					android:paddingBottom="5dp"
         			android:text="@string/ssl_validator_label_issuer"
         			android:textAppearance="?android:attr/textAppearanceMedium"
-        			/>
+        		/>
 				
 				<TextView
 				    android:id="@+id/label_issuer_CN"
@@ -213,7 +215,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_CN"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_issuer_CN"
@@ -222,7 +224,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_issuer_O"
@@ -230,7 +232,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_O"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_issuer_O"
@@ -239,7 +241,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_issuer_OU"
@@ -247,7 +249,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_OU"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_issuer_OU"
@@ -256,7 +258,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_issuer_ST"
@@ -264,7 +266,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_ST"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_issuer_ST"
@@ -273,7 +275,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 
 				<TextView
 				    android:id="@+id/label_issuer_C"
@@ -281,7 +283,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_C"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/value_issuer_C"
@@ -290,7 +292,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_issuer_L"
@@ -298,7 +300,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_L"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_issuer_L"
@@ -307,7 +309,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
         			android:id="@+id/label_validity"
@@ -316,7 +318,7 @@
 					android:paddingBottom="5dp"
         			android:text="@string/ssl_validator_label_validity"
         			android:textAppearance="?android:attr/textAppearanceMedium"
-        			/>
+        		/>
 				
 				<TextView
 				    android:id="@+id/label_validity_from"
@@ -324,7 +326,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_validity_from"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_validity_from"
@@ -333,7 +335,7 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 				
 				<TextView
 				    android:id="@+id/label_validity_to"
@@ -341,7 +343,7 @@
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_validity_to"
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
 			    
 				<TextView
 				    android:id="@+id/value_validity_to"
@@ -350,7 +352,8 @@
 				    android:paddingBottom="5dp"
 				    android:text=""
 				    android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				/>
+				
 
 				<TextView
         			android:id="@+id/label_signature"
@@ -359,7 +362,7 @@
 					android:paddingBottom="5dp"
         			android:text="@string/ssl_validator_label_signature"
         			android:textAppearance="?android:attr/textAppearanceMedium"
-        			/>
+        		/>
 				
 				<TextView
         			android:id="@+id/label_signature_algorithm"
@@ -367,17 +370,18 @@
         			android:layout_height="wrap_content"
         			android:text="@string/ssl_validator_label_signature_algorithm"
         			android:textAppearance="?android:attr/textAppearanceSmall"
-        			/>
+        		/>
 				
-				<TextView
+								<TextView
         			android:id="@+id/value_signature_algorithm"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
         			android:text=""
         			android:textAppearance="?android:attr/textAppearanceSmall"
-        			/>
-
+        		/>
+																								
+								
 				<TextView
         			android:id="@+id/value_signature"
         			android:layout_width="wrap_content"
@@ -385,7 +389,7 @@
 					android:paddingBottom="5dp"
         			android:text=""
         			android:textAppearance="?android:attr/textAppearanceSmall"
-        			/>
+        		/>
 				
 		</LinearLayout>
 		
@@ -395,7 +399,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/standard_padding"
+		android:paddingTop="16dp"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
@@ -408,27 +412,27 @@
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
 
 		<android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
-			android:theme="@style/Button"
+			style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />
 
     </LinearLayout>
 
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 42c41036..2491ad20 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -200,9 +200,9 @@
   <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
-  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
-  <string name="confirmation_remove_remote">Vom Server entfernen</string>
-  <string name="confirmation_remove_remote_and_local">Lokal und auf Server</string>
+  <string name="confirmation_remove_folder_local">Nur lokal</string>
+  <string name="confirmation_remove_remote">Vom Server</string>
+  <string name="confirmation_remove_remote_and_local">Lokal &amp; Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
   <string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string>
@@ -229,7 +229,7 @@
   <string name="ssl_validator_question">Möchten Sie diesem Zertifikat trotzdem vertrauen?</string>
   <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
   <string name="ssl_validator_btn_details_see">Details</string>
-  <string name="ssl_validator_btn_details_hide">Ausblenden</string>
+  <string name="ssl_validator_btn_details_hide">Überblick</string>
   <string name="ssl_validator_label_subject">Ausgestellt für:</string>
   <string name="ssl_validator_label_issuer">Ausgestellt von:</string>
   <string name="ssl_validator_label_CN">Üblicher Name:</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4d0b86e6..d669ec38 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -200,9 +200,9 @@
   <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchtest Du wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
-  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
-  <string name="confirmation_remove_remote">Vom Server entfernen</string>
-  <string name="confirmation_remove_remote_and_local">Lokal und auf Server</string>
+  <string name="confirmation_remove_folder_local">Nur lokal</string>
+  <string name="confirmation_remove_remote">Vom Server</string>
+  <string name="confirmation_remove_remote_and_local">Lokal &amp; Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
   <string name="rename_dialog_title">Gib einen neuen Namen ein</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2de204d5..a5d412b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -208,9 +208,9 @@
     <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>
     <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents?"</string>
     <string name="confirmation_remove_local">Local only</string>
-    <string name="confirmation_remove_folder_local">Local contents only</string>
-    <string name="confirmation_remove_remote">Remove from server</string>
-    <string name="confirmation_remove_remote_and_local">Remote and local</string>
+    <string name="confirmation_remove_folder_local">Local only</string>
+    <string name="confirmation_remove_remote">From server</string>
+    <string name="confirmation_remove_remote_and_local">Remote &amp; local</string>
     <string name="remove_success_msg">"Removal succeeded"</string>
     <string name="remove_fail_msg">"Removal failed"</string>
     <string name="rename_dialog_title">Enter a new name</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1716a502..3bb1fe43 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,6 +58,10 @@
 		<item name="android:textColor">@color/white</item>
 	</style>
 
+	<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">@color/color_accent</item>
+	</style>
+
 	<!-- separat translucent action bar style -->
 	<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
 		<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
index 72f40f97..28419e62 100644
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -39,6 +39,8 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDia
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 
+    private OCFile mTargetFile;
+
     private static final String ARG_TARGET_FILE = "TARGET_FILE";
 
     /**
@@ -54,29 +56,26 @@ implements ConfirmationDialogFragmentListener {
         int messageStringId = R.string.confirmation_remove_alert;
         
         int posBtn = R.string.confirmation_remove_remote;
-        int neuBtn = -1;
+        int negBtn = -1;
         if (file.isFolder()) {
             messageStringId = R.string.confirmation_remove_folder_alert;
             posBtn = R.string.confirmation_remove_remote_and_local;
-            neuBtn = R.string.confirmation_remove_folder_local;
+            negBtn = R.string.confirmation_remove_local;
         } else if (file.isDown()) {
             posBtn = R.string.confirmation_remove_remote_and_local;
-            neuBtn = R.string.confirmation_remove_local;
+            negBtn = R.string.confirmation_remove_local;
         }
         
-        
         args.putInt(ARG_CONF_RESOURCE_ID, messageStringId);
         args.putStringArray(ARG_CONF_ARGUMENTS, new String[]{file.getFileName()});
         args.putInt(ARG_POSITIVE_BTN_RES, posBtn);
-        args.putInt(ARG_NEUTRAL_BTN_RES, neuBtn);
-        args.putInt(ARG_NEGATIVE_BTN_RES, R.string.common_cancel);
+        args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no);
+        args.putInt(ARG_NEGATIVE_BTN_RES, negBtn);
         args.putParcelable(ARG_TARGET_FILE, file);
         frag.setArguments(args);
         
         return frag;
     }
-
-    private OCFile mTargetFile;
     
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -104,7 +103,7 @@ implements ConfirmationDialogFragmentListener {
      * Performs the removal of the local copy of the target file
      */
     @Override
-    public void onNeutral(String callerTag) {
+    public void onCancel(String callerTag) {
         ComponentsGetter cg = (ComponentsGetter)getActivity();
         cg.getFileOperationsHelper().removeFile(mTargetFile, true);
         
@@ -138,8 +137,7 @@ implements ConfirmationDialogFragmentListener {
     }
 
     @Override
-    public void onCancel(String callerTag) {
+    public void onNeutral(String callerTag) {
         // nothing to do here
     }
-    
 }
\ No newline at end of file