fixes after rebase

src/main/res/layout/activity_row.xml

@@ -46,22 +46,4 @@
 		android:singleLine="true"
 		android:textAppearance="?android:attr/textAppearanceLargePopupMenu" />
 
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="@dimen/user_icon_size_independent"
-			android:layout_height="@dimen/user_icon_size_independent"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/standard_padding"
-			android:layout_marginRight="@dimen/standard_padding"
-			android:contentDescription="@string/activity_icon"/>
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-			android:singleLine="true"
-            android:ellipsize="marquee"/>
-
     </LinearLayout>

src/main/res/layout/file_details_fragment.xml

@@ -47,7 +47,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@+id/fdIcon"
                 android:layout_toRightOf="@+id/fdIcon"
-                android:orientation="vertical"
                 android:paddingLeft="@dimen/standard_padding"
                 android:paddingStart="@dimen/standard_padding"
                 android:paddingEnd="@dimen/zero"
@@ -79,8 +78,6 @@
                         android:id="@+id/file_separator"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="end"
-                        android:paddingEnd="@dimen/standard_quarter_padding"
                         android:paddingRight="@dimen/standard_quarter_padding"
                         android:paddingEnd="@dimen/standard_quarter_padding"
                         android:paddingStart="@dimen/zero"
@@ -216,8 +213,7 @@
                     android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginRight="@dimen/standard_half_margin"
                     android:src="@drawable/shared_via_link"
-                    android:visibility="gone"
-                    android:contentDescription="@string/shared_via_link_icon"/>
+                    android:visibility="gone"/>
 
                 <TextView
                     android:id="@+id/fdSharebyLink"

src/main/res/values-b+es+419/strings.xml

@@ -119,7 +119,6 @@
     <string name="filedetails_sync_file">Sincronizar</string>
     <string name="filedetails_renamed_in_upload_msg">El archivo se renombró como %1$s durante la carga</string>
     <string name="list_layout">Vista de lista</string>
-    <string name="action_share">Compartir</string>
     <string name="common_yes">Sí</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>